Replace QPDF by PDFio as PDF manipulation library in libcupsfilters

.github/workflows/build.yaml

@@ -24,21 +24,16 @@ jobs:
        sudo apt-get install -y avahi-daemon libavahi-client-dev libssl-dev libpam-dev libusb-1.0-0-dev zlib1g-dev
        sudo apt install autotools-dev autopoint cmake libtool pkg-config libcups2-dev libexif-dev liblcms2-dev libfontconfig1-dev
        sudo apt install libfreetype6-dev build-essential qtbase5-dev qtchooser libcairo2-dev libboost-system-dev libboost-thread-dev libboost-program-options-dev libboost-test-dev libopenjp2-7-dev liblcms2-dev libjpeg-dev
-    - name: Install libqpdf > 11.0.0
+    - name: Install pdfio >= 1.4.0
       run: |
         cd ..
-        mkdir qpdf
-        wget -O qpdf-11.6.3.tar.gz https://sourceforge.net/projects/qpdf/files/qpdf/11.6.3/qpdf-11.6.3.tar.gz
-        tar -xzf qpdf-11.6.3.tar.gz
-        cd qpdf-11.6.3
-        mkdir build &&
-        cd build &&
-        cmake -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DBUILD_STATIC_LIBS=OFF \
-        -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/qpdf-11.6.3 \
-        .. &&
-        make
+        mkdir pdfio
+        wget https://github.com/michaelrsweet/pdfio/releases/download/v1.4.0/pdfio-1.4.0.tar.gz
+        tar -xzf pdfio-1.4.0.tar.gz
+        cd pdfio-1.4.0
+        ./configure --prefix=/usr --enable-shared
+        make all
+        make test
         sudo make install
         cd ..
         cd ..
@@ -57,4 +52,4 @@ jobs:
     - name: make
       run: make
     - name: Run Tests
-      run: make check || cat test/error_log*
+      run: make check || cat test/error_log*

Makefile.am

@@ -178,32 +178,31 @@ libcupsfilters_la_SOURCES = \
 	cupsfilters/lut.c \
 	cupsfilters/mupdftopwg.c \
 	cupsfilters/pack.c \
-	cupsfilters/pclmtoraster.cxx \
-	cupsfilters/pdf.cxx \
-	cupsfilters/pdftopdf/pdftopdf.cxx \
+	cupsfilters/pclmtoraster.c \
+	cupsfilters/pdf.c \
+	cupsfilters/pdftopdf/pdftopdf.c \
 	cupsfilters/pdftopdf/pdftopdf-private.h \
-	cupsfilters/pdftopdf/pdftopdf-processor.cxx \
-	cupsfilters/pdftopdf/pdftopdf-processor-private.h \
-	cupsfilters/pdftopdf/qpdf-pdftopdf-processor.cxx \
-	cupsfilters/pdftopdf/qpdf-pdftopdf-processor-private.h \
-	cupsfilters/pdftopdf/pptypes.cxx \
-	cupsfilters/pdftopdf/pptypes-private.h \
-	cupsfilters/pdftopdf/nup.cxx \
-	cupsfilters/pdftopdf/nup-private.h \
-	cupsfilters/pdftopdf/intervalset.cxx \
-	cupsfilters/pdftopdf/intervalset-private.h \
-	cupsfilters/pdftopdf/qpdf-tools.cxx \
-	cupsfilters/pdftopdf/qpdf-tools-private.h \
-	cupsfilters/pdftopdf/qpdf-xobject.cxx \
-	cupsfilters/pdftopdf/qpdf-xobject-private.h \
-	cupsfilters/pdftopdf/qpdf-pdftopdf.cxx \
-	cupsfilters/pdftopdf/qpdf-pdftopdf-private.h \
-	cupsfilters/pdftopdf/qpdf-cm.cxx \
-	cupsfilters/pdftopdf/qpdf-cm-private.h \
+	cupsfilters/pdftopdf/pdftopdf-processor.c \
+	cupsfilters/pdftopdf/pdfio-pdftopdf-processor.c \
+	cupsfilters/pdftopdf/processor.h \
+	cupsfilters/pdftopdf/pptypes.c \
+        cupsfilters/pdftopdf/pptypes-private.h \
+	cupsfilters/pdftopdf/nup.c \
+        cupsfilters/pdftopdf/nup-private.h \
+        cupsfilters/pdftopdf/intervalset.c \
+        cupsfilters/pdftopdf/intervalset-private.h \
+	cupsfilters/pdftopdf/pdfio-tools.c \
+	cupsfilters/pdftopdf/pdfio-tools-private.h \
+	cupsfilters/pdftopdf/pdfio-xobject.c \
+	cupsfilters/pdftopdf/pdfio-xobject-private.h \
+	cupsfilters/pdftopdf/pdfio-pdftopdf.c \
+	cupsfilters/pdftopdf/pdfio-pdftopdf-private.h \
+	cupsfilters/pdftopdf/pdfio-cm.c \
+	cupsfilters/pdftopdf/pdfio-cm-private.h \
 	cupsfilters/pdftoraster.cxx \
 	cupsfilters/pdfutils.c \
 	cupsfilters/pdfutils-private.h \
-	cupsfilters/pwgtopdf.cxx \
+	cupsfilters/pwgtopdf.c \
 	cupsfilters/pwgtoraster.c \
 	cupsfilters/raster.c \
 	cupsfilters/rastertopwg.c \
@@ -217,7 +216,7 @@ libcupsfilters_la_LIBADD = \
 	$(FONTCONFIG_LIBS) \
 	$(CUPS_LIBS) \
 	$(LCMS_LIBS) \
-	$(LIBQPDF_LIBS) \
+	$(LIBPDFIO_LIBS) \
 	$(LIBJPEG_LIBS) \
 	$(EXIF_LIBS) \
 	$(LIBPNG_LIBS) \
@@ -232,7 +231,7 @@ libcupsfilters_la_CFLAGS = \
 	$(FONTCONFIG_CFLAGS) \
 	$(CUPS_CFLAGS) \
 	$(LCMS_CFLAGS) \
-	$(LIBQPDF_CFLAGS) \
+	$(LIBPDFIO_CFLAGS) \
 	$(LIBJPEG_CFLAGS) \
 	$(EXIF_CFLAGS) \
 	$(LIBPNG_CFLAGS) \
@@ -320,11 +319,10 @@ test_ps_LDADD = libcupsfilters.la
 testfilters_SOURCES = \
 	cupsfilters/testfilters.c \
 	$(pkgfiltersinclude_DATA)
-
 testfilters_LDADD = \
 	libcupsfilters.la \
-	-lm -ldl -lcups
-
+	$(CUPS_LIBS) \
+	-lm -ldl
 testfilters_LDFLAGS = \
 	-D_GNU_SOURCE \
 	-L/usr/lib

configure.ac

@@ -291,7 +291,7 @@ AS_IF([test x"$lcms2" = "xno"], [
 	AC_DEFINE([USE_LCMS1], [1], [Defines if use lcms1])
 ])
 PKG_CHECK_MODULES([FONTCONFIG], [fontconfig >= 2.0.0])
-PKG_CHECK_MODULES([LIBQPDF], [libqpdf >= 11.0.0])
+PKG_CHECK_MODULES([LIBPDFIO], [pdfio >= 1.3.0])
 
 # =================
 # Check for Poppler

cupsfilters/ghostscript.c

@@ -997,7 +997,7 @@ cfFilterGhostscript(int inputfd,            // I - File descriptor input
 
     if (doc_type == GS_DOC_TYPE_PDF)
     {
-      int pages = cfPDFPagesFP(fp);
+      int pages = cfPDFPagesFP(filename);
 
       if (pages == 0)
       {