Kaydet (Commit) 41b57aff authored tarafından Miklos Vajna's avatar Miklos Vajna

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/43114Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
Tested-by: 's avatarJenkins <ci@libreoffice.org>
üst 7f0bf622
...@@ -9,8 +9,6 @@ ...@@ -9,8 +9,6 @@
pdfium_patches := pdfium_patches :=
pdfium_patches += visibility.patch.1 pdfium_patches += visibility.patch.1
# To support macOS 10.9 baseline.
pdfium_patches += macos.patch.1
pdfium_patches += ubsan.patch pdfium_patches += ubsan.patch
pdfium_patches += freetype.patch.1 pdfium_patches += freetype.patch.1
......
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();
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment