Ticket #22759: libreoffice-26.2.0.3-poppler_26.02-1.patch

sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx

@@ -712 +712 @@
 }
 
 #if POPPLER_CHECK_VERSION(0, 71, 0)
-void PDFOutDev::setDefaultCTM(const double *pMat)
+void PDFOutDev::setDefaultCTM(const std::array<double, 6> & pMat)
 #else
 void PDFOutDev::setDefaultCTM(double *pMat)
 #endif
@@ -737 +737 @@
 {
     assert(state);
 
-    const double* const pMat = state->getCTM();
-    assert(pMat);
+    const std::array<double, 6> pMat = state->getCTM();
 
     printf( "updateCtm %f %f %f %f %f %f\n",
             normalize(pMat[0]),
@@ -1044 +1043 @@
 
     double csdx = 0.0;
     double csdy = 0.0;
-    if (!state->getFont() || !state->getFont()->getWMode())
+    if (!state->getFont() || state->getFont()->getWMode() == GfxFont::WritingMode::Horizontal)
     {
         csdx = state->getCharSpace();
         if (*u == ' ')
@@ -1067 +1066 @@
     const double aPositionX(x-originX);
     const double aPositionY(y-originY);
 
-    const double* pTextMat=state->getTextMat();
+    const std::array<double, 6> pTextMat=state->getTextMat();
     printf( "drawChar %f %f %f %f %f %f %f %f %f ",
             normalize(aPositionX),
             normalize(aPositionY),
@@ -1348 +1347 @@
 
     const int nDPI = 72; // GfxState seems to have 72.0 as magic for some reason
     auto pSplashGfxState = new GfxState(nDPI, nDPI, &aBox, 0, false);
-    auto pSplashOut = new SplashOutputDev(splashModeRGB8, 1, false, nullptr);
+    auto pSplashOut = new SplashOutputDev(splashModeRGB8, 1, nullptr);
     pSplashOut->setEnableFreeType(false);
     pSplashOut->startDoc(m_pDoc);
     pSplashOut->startPage(0 /* pageNum */, pSplashGfxState, nullptr /* xref */);

sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx

@@ -84 +84 @@
             isUnderline(rSrc.isUnderline),
             size(rSrc.size)
         {
-            familyName.append(&rSrc.getFamilyName());
+            familyName.append(rSrc.getFamilyName());
         }
 
         FontAttributes& operator=( const FontAttributes& rSrc )
         {
             familyName.clear();
-            familyName.append(&rSrc.getFamilyName());
+            familyName.append(rSrc.getFamilyName());
 
             isEmbedded  = rSrc.isEmbedded;
             maFontWeight= rSrc.maFontWeight;
@@ -103 +103 @@
 
         bool operator==(const FontAttributes& rFont) const
         {
-            return getFamilyName().cmp(&rFont.getFamilyName())==0 &&
+            return getFamilyName().compare(rFont.getFamilyName())==0 &&
                 isEmbedded == rFont.isEmbedded &&
                 maFontWeight == rFont.maFontWeight &&
                 isItalic == rFont.isItalic &&
@@ -172 +172 @@
 
         // Set default transform matrix.
 #if POPPLER_CHECK_VERSION(0, 71, 0)
-        virtual void setDefaultCTM(const double *ctm) override;
+        virtual void setDefaultCTM(const std::array<double, 6> & ctm) override;
 #else
         virtual void setDefaultCTM(double *ctm) override;
 #endif