diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2020-04-17 17:28:58 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-04-17 19:17:36 +0200 |
| commit | 141e0449fdab89384564659191492b698e4b13d8 (patch) | |
| tree | 518d53041ba8f32e466afc317c5aeafb235efba1 /vcl/source/filter | |
| parent | f7f7fa8fe313b03e0ee683b2154a1bf49ee9d741 (diff) | |
Change default PDF version to 1.6 (released in 2004)
We already write markup which is newer than 1.5, but the PDF version was
not changed. Fix the one violation I'm aware of.
Printing is left unchanged, similar to how commit
99ac4ee05b039166eedfe361fb985682fd92dd13 (Change default PDF version to
1.5, 2018-04-24) updated the default last time.
Change-Id: I9598dc46fe7db428bd2eff98bebff8b3c873b4ff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92457
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'vcl/source/filter')
| -rw-r--r-- | vcl/source/filter/ipdf/pdfread.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/filter/ipdf/pdfread.cxx b/vcl/source/filter/ipdf/pdfread.cxx index 022fa502f986..1df96ad46e72 100644 --- a/vcl/source/filter/ipdf/pdfread.cxx +++ b/vcl/source/filter/ipdf/pdfread.cxx @@ -65,7 +65,7 @@ bool isCompatible(SvStream& rInStream, sal_uInt64 nPos, sal_uInt64 nSize) sal_Int32 nMajor = OString(aFirstBytes[5]).toInt32(); sal_Int32 nMinor = OString(aFirstBytes[7]).toInt32(); - return !(nMajor > 1 || (nMajor == 1 && nMinor > 5)); + return !(nMajor > 1 || (nMajor == 1 && nMinor > 6)); } /// Takes care of transparently downgrading the version of the PDF stream in @@ -81,7 +81,7 @@ bool getCompatibleStream(SvStream& rInStream, SvStream& rOutStream) rOutStream.WriteStream(rInStream, nSize); else { - // Downconvert to PDF-1.5. + // Downconvert to PDF-1.6. FPDF_LIBRARY_CONFIG aConfig; aConfig.version = 2; aConfig.m_pUserFontPaths = nullptr; @@ -103,8 +103,8 @@ bool getCompatibleStream(SvStream& rInStream, SvStream& rOutStream) aWriter.version = 1; aWriter.WriteBlock = &CompatibleWriterCallback; - // 15 means PDF-1.5. - if (!FPDF_SaveWithVersion(pPdfDocument, &aWriter, 0, 15)) + // 16 means PDF-1.6. + if (!FPDF_SaveWithVersion(pPdfDocument, &aWriter, 0, 16)) return false; FPDF_CloseDocument(pPdfDocument); |