vcl/inc/pdf/pdfwriter_impl.hxx | 2 +-
vcl/source/gdi/pdfwriter_impl.cxx | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 8b865782d798a33f95ddedad2bde78cb8450708a
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed May 3 09:50:22 2023 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed May 3 21:46:30 2023 +0200
pass the std::vector instead of its data()
Change-Id: I9319896eb4d0e7728a9ded77fa1bfd05e63fbbe3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151326
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/inc/pdf/pdfwriter_impl.hxx b/vcl/inc/pdf/pdfwriter_impl.hxx
index fc9e68afc18b..bad2d387511c 100644
--- a/vcl/inc/pdf/pdfwriter_impl.hxx
+++ b/vcl/inc/pdf/pdfwriter_impl.hxx
@@ -937,7 +937,7 @@ i12626
/* writes a font descriptor and returns its object id (or 0) */
sal_Int32 emitFontDescriptor(const vcl::font::PhysicalFontFace*,
FontSubsetInfo const &, sal_Int32 nSubsetID, sal_Int32 nStream);
/* writes a ToUnicode cmap, returns the corresponding stream object */
- sal_Int32 createToUnicodeCMap( sal_uInt8 const * pEncoding, const sal_Ucs*
pCodeUnits, const sal_Int32* pCodeUnitsPerGlyph,
+ sal_Int32 createToUnicodeCMap( sal_uInt8 const * pEncoding, const
std::vector<sal_Ucs>& CodeUnits, const sal_Int32* pCodeUnitsPerGlyph,
const sal_Int32* pEncToUnicodeIndex,
uint32_t nGlyphs );
/* get resource dict object number */
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index 7d51e3d916d1..d146e3ae85dc 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -2556,7 +2556,7 @@ bool PDFWriterImpl::emitType3Font(const
vcl::font::PhysicalFontFace* pFace,
nFontDescriptor = emitFontDescriptor(pFace, aSubsetInfo,
rSubset.m_nFontID, 0);
if (nToUnicodeStream)
- nToUnicodeStream = createToUnicodeCMap(pEncoding,
aCodeUnits.data(), pCodeUnitsPerGlyph,
+ nToUnicodeStream = createToUnicodeCMap(pEncoding, aCodeUnits,
pCodeUnitsPerGlyph,
pEncToUnicodeIndex,
nGlyphs);
// write font object
@@ -2865,14 +2865,14 @@ static void appendSubsetName( int nSubsetID,
std::u16string_view rPSName, OStrin
}
sal_Int32 PDFWriterImpl::createToUnicodeCMap( sal_uInt8 const * pEncoding,
- const sal_Ucs* pCodeUnits,
+ const std::vector<sal_Ucs>&
rCodeUnits,
const sal_Int32*
pCodeUnitsPerGlyph,
const sal_Int32*
pEncToUnicodeIndex,
uint32_t nGlyphs )
{
int nMapped = 0;
for (auto n = 0u; n < nGlyphs; ++n)
- if (pCodeUnitsPerGlyph[n] && pCodeUnits[pEncToUnicodeIndex[n]])
+ if (pCodeUnitsPerGlyph[n] && rCodeUnits[pEncToUnicodeIndex[n]])
nMapped++;
if( nMapped == 0 )
@@ -2900,7 +2900,7 @@ sal_Int32 PDFWriterImpl::createToUnicodeCMap( sal_uInt8
const * pEncoding,
int nCount = 0;
for (auto n = 0u; n < nGlyphs; ++n)
{
- if (pCodeUnitsPerGlyph[n] && pCodeUnits[pEncToUnicodeIndex[n]])
+ if (pCodeUnitsPerGlyph[n] && rCodeUnits[pEncToUnicodeIndex[n]])
{
if( (nCount % 100) == 0 )
{
@@ -2916,8 +2916,8 @@ sal_Int32 PDFWriterImpl::createToUnicodeCMap( sal_uInt8
const * pEncoding,
sal_Int32 nIndex = pEncToUnicodeIndex[n];
for( sal_Int32 j = 0; j < pCodeUnitsPerGlyph[n]; j++ )
{
- appendHex( static_cast<sal_Int8>(pCodeUnits[nIndex + j] /
256), aContents );
- appendHex( static_cast<sal_Int8>(pCodeUnits[nIndex + j] &
255), aContents );
+ appendHex( static_cast<sal_Int8>(rCodeUnits[nIndex + j] /
256), aContents );
+ appendHex( static_cast<sal_Int8>(rCodeUnits[nIndex + j] &
255), aContents );
}
aContents.append( ">\n" );
nCount++;
@@ -3184,7 +3184,7 @@ bool PDFWriterImpl::emitFonts()
sal_Int32 nFontDescriptor = emitFontDescriptor( subset.first,
aSubsetInfo, s_subset.m_nFontID, nFontStream );
if( nToUnicodeStream )
- nToUnicodeStream = createToUnicodeCMap( pEncoding,
aCodeUnits.data(), pCodeUnitsPerGlyph, pEncToUnicodeIndex, nGlyphs );
+ nToUnicodeStream = createToUnicodeCMap( pEncoding,
aCodeUnits, pCodeUnitsPerGlyph, pEncToUnicodeIndex, nGlyphs );
sal_Int32 nFontObject = createObject();
if ( !updateObject( nFontObject ) ) return false;
