[Libreoffice-commits] core.git: external/pdfium

[Miklos Vajna]

 external/pdfium/UnpackedTarball_pdfium.mk |    2 
 external/pdfium/macos.patch.1             |   62 ------------------------------
 2 files changed, 64 deletions(-)

New commits:
commit 41b57affa0e6edfb77acccf10843260d43e26366
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Oct 4 09:10:21 2017 +0200

    pdfium: remove no longer needed Mac baseline patch
    
    This was needed on 10.9, current build baseline is 10.12.
    
    Change-Id: Ide1ddc9ea918676ab9363b7aeefd9b5606351e8d
    Reviewed-on: https://gerrit.libreoffice.org/43114
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/external/pdfium/UnpackedTarball_pdfium.mk b/external/pdfium/UnpackedTarball_pdfium.mk
index daa252409edb..c3a48dce9583 100644
--- a/external/pdfium/UnpackedTarball_pdfium.mk
+++ b/external/pdfium/UnpackedTarball_pdfium.mk
@@ -9,8 +9,6 @@
 
 pdfium_patches :=
 pdfium_patches += visibility.patch.1
-# To support macOS 10.9 baseline.
-pdfium_patches += macos.patch.1
 pdfium_patches += ubsan.patch
 pdfium_patches += freetype.patch.1
 
diff --git a/external/pdfium/macos.patch.1 b/external/pdfium/macos.patch.1
deleted file mode 100644
index 360e54a2ca86..000000000000
--- a/external/pdfium/macos.patch.1
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/core/fpdfapi/parser/cpdf_hint_tables.cpp b/core/fpdfapi/parser/cpdf_hint_tables.cpp
-index e000188..39fd200 100644
---- a/core/fpdfapi/parser/cpdf_hint_tables.cpp
-+++ b/core/fpdfapi/parser/cpdf_hint_tables.cpp
-@@ -150,7 +150,8 @@ bool CPDF_HintTables::ReadPageHintTable(CFX_BitStream* hStream) {
-     safeDeltaObj += dwObjLeastNum;
-     if (!safeDeltaObj.IsValid())
-       return false;
--    m_dwDeltaNObjsArray.push_back(safeDeltaObj.ValueOrDie());
-+    uint32_t deltaObj = safeDeltaObj.ValueOrDie();
-+    m_dwDeltaNObjsArray.push_back(deltaObj);
-   }
-   hStream->ByteAlign();
- 
-@@ -166,7 +167,8 @@ bool CPDF_HintTables::ReadPageHintTable(CFX_BitStream* hStream) {
-     if (!safePageLen.IsValid())
-       return false;
- 
--    dwPageLenArray.push_back(safePageLen.ValueOrDie());
-+    uint32_t pageLen = safePageLen.ValueOrDie();
-+    dwPageLenArray.push_back(pageLen);
-   }
- 
-   int nOffsetE = GetEndOfFirstPageOffset();
-@@ -325,13 +327,15 @@ bool CPDF_HintTables::ReadSharedObjHintTable(CFX_BitStream* hStream,
-       if (!safeObjNum.IsValid())
-         return false;
- 
--      m_dwSharedObjNumArray.push_back(safeObjNum.ValueOrDie());
-+      uint32_t objNum = safeObjNum.ValueOrDie();
-+      m_dwSharedObjNumArray.push_back(objNum);
-       if (i == m_nFirstPageSharedObjs) {
-         FX_SAFE_FILESIZE safeLoc = dwFirstSharedObjLoc;
-         if (!safeLoc.IsValid())
-           return false;
- 
--        m_szSharedObjOffsetArray.push_back(safeLoc.ValueOrDie());
-+        FX_FILESIZE loc = safeLoc.ValueOrDie();
-+        m_szSharedObjOffsetArray.push_back(loc);
-       }
-     }
- 
-@@ -341,7 +345,8 @@ bool CPDF_HintTables::ReadSharedObjHintTable(CFX_BitStream* hStream,
-       if (!safeLoc.IsValid())
-         return false;
- 
--      m_szSharedObjOffsetArray.push_back(safeLoc.ValueOrDie());
-+      FX_FILESIZE loc = safeLoc.ValueOrDie();
-+      m_szSharedObjOffsetArray.push_back(loc);
-     }
-   }
- 
-@@ -351,7 +356,8 @@ bool CPDF_HintTables::ReadSharedObjHintTable(CFX_BitStream* hStream,
-     if (!safeLoc.IsValid())
-       return false;
- 
--    m_szSharedObjOffsetArray.push_back(safeLoc.ValueOrDie());
-+    FX_FILESIZE loc = safeLoc.ValueOrDie();
-+    m_szSharedObjOffsetArray.push_back(loc);
-   }
- 
-   hStream->ByteAlign();