go ahead
On 05/12/24 20:07 +0100, Matthias Kilian wrote:
> Fix build with poppler-24.12.
>
> Lightly tested by importing a PDF.
>
> ok?
>
> Ciao,
> Kili
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/editors/libreoffice/Makefile,v
> diff -u -p -r1.320 Makefile
> --- Makefile 2 Nov 2024 20:44:03 -0000 1.320
> +++ Makefile 5 Dec 2024 19:03:06 -0000
> @@ -28,6 +28,7 @@ DISTNAME= libreoffice-${VERSION}
> WRKDIST= ${WRKDIR}/libreoffice-${VERSION}
> CATEGORIES= editors productivity
> DPB_PROPERTIES= parallel
> +REVISION= 0
>
> EPOCH= 0
>
> Index: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
> ===================================================================
> RCS file:
> /cvs/ports/editors/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx,v
> diff -u -p -r1.12 patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
> --- patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
> 24 Oct 2024 19:11:42 -0000 1.12
> +++ patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
> 5 Dec 2024 19:03:06 -0000
> @@ -1,9 +1,25 @@
> -Fix build with poppler-24.10.0.
> +Fix build with poppler-24.10.0 and 24.12.0.
>
> Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
> --- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig
> +++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
> -@@ -1306,9 +1306,9 @@ poppler_bool PDFOutDev::tilingPatternFill(GfxState *st
> +@@ -1084,13 +1084,14 @@ void PDFOutDev::drawImageMask(GfxState* pState,
> Object
> + {
> + if (m_bSkipImages)
> + return;
> ++ bool hasAlpha;
> + OutputBuffer aBuf; initBuf(aBuf);
> +
> + printf( "drawMask %d %d %d", width, height, invert );
> +
> + int bitsPerComponent = 1;
> + StreamColorSpaceMode csMode = streamCSNone;
> +- str->getImageParams( &bitsPerComponent, &csMode );
> ++ str->getImageParams( &bitsPerComponent, &csMode, &hasAlpha );
> + if( bitsPerComponent == 1 && (csMode == streamCSNone || csMode ==
> streamCSDeviceGray) )
> + {
> + GfxRGB oneColor = { dblToCol( 1.0 ), dblToCol( 1.0 ), dblToCol( 1.0
> ) };
> +@@ -1306,9 +1307,9 @@ poppler_bool PDFOutDev::tilingPatternFill(GfxState *st
> 0, nBitmapWidth * nBitmapHeight, Object(objNull)));
> auto aDecode = Object(objNull);
> std::unique_ptr<GfxImageColorMap> pRgbIdentityColorMap(new
> GfxImageColorMap(8, &aDecode,
--
Regards,
Robert Nagy
