summaryrefslogtreecommitdiff
path: root/vcl/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2023-05-03 09:50:22 +0100
committerCaolán McNamara <caolanm@redhat.com>2023-05-03 21:46:30 +0200
commit8b865782d798a33f95ddedad2bde78cb8450708a (patch)
tree732b066cc7782c04bc69fc6413fd918a6c5d8697 /vcl/source
parenta7a008d055eecf540b5d20060754cc686508a895 (diff)
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 <caolanm@redhat.com>
Diffstat (limited to 'vcl/source')
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx14
1 files changed, 7 insertions, 7 deletions
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;