Ticket #20741: libreoffice-24.8.3.2-poppler_24.12-1.patch

File libreoffice-24.8.3.2-poppler_24.12-1.patch, 1.4 KB (added by martyj19, 4 months ago)

Adjustment for libreoffice for poppler versions through 24.12

  • TabularUnified sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx

    diff -Naur libreoffice-24.8.3.2.orig/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx libreoffice-24.8.3.2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
    old new  
    10901090
    10911091    int bitsPerComponent = 1;
    10921092    StreamColorSpaceMode csMode = streamCSNone;
    1093     str->getImageParams( &bitsPerComponent, &csMode );
     1093    bool hasAlpha = false;
     1094    str->getImageParams( &bitsPerComponent, &csMode, &hasAlpha );
    10941095    if( bitsPerComponent == 1 && (csMode == streamCSNone || csMode == streamCSDeviceGray) )
    10951096    {
    10961097        GfxRGB oneColor = { dblToCol( 1.0 ), dblToCol( 1.0 ), dblToCol( 1.0 ) };
     
    13061307        0, nBitmapWidth * nBitmapHeight, Object(objNull)));
    13071308    auto aDecode = Object(objNull);
    13081309    std::unique_ptr<GfxImageColorMap> pRgbIdentityColorMap(new GfxImageColorMap(8, &aDecode,
    1309         new GfxDeviceRGBColorSpace()));
     1310        std::make_unique<GfxDeviceRGBColorSpace>()));
    13101311    std::unique_ptr<GfxImageColorMap> pGrayIdentityColorMap(new GfxImageColorMap(8, &aDecode,
    1311         new GfxDeviceGrayColorSpace()));
     1312        std::make_unique<GfxDeviceGrayColorSpace>()));
    13121313
    13131314    OutputBuffer aBuf; initBuf(aBuf);
    13141315    writePng_(aBuf, pRgbStr.get(), nBitmapWidth, nBitmapHeight, pRgbIdentityColorMap.get(),