[Libreoffice-commits] core.git: vcl/source

[Julien Nabet (via logerrit)]

 vcl/source/font/fontcharmap.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 3b079241da281d5e60572c8258d827af67f8f847
Author:     Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Fri Oct 22 18:25:45 2021 +0200
Commit:     Julien Nabet <serval2...@yahoo.fr>
CommitDate: Fri Oct 22 19:30:56 2021 +0200

    Revert partly "Simplify vector initialization in vcl"
    
    since it needs 2 allocations instead of one
    
    This reverts commit 43a9bf11203ed92096af34ab828501e0218832c7 .
    
    Change-Id: I1d8553d9c31f663dd990146e6d375bbbaf32fb27
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124072
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2...@yahoo.fr>

diff --git a/vcl/source/font/fontcharmap.cxx b/vcl/source/font/fontcharmap.cxx
index 72a4feacd36e..90a08d617a86 100644
--- a/vcl/source/font/fontcharmap.cxx
+++ b/vcl/source/font/fontcharmap.cxx
@@ -176,8 +176,9 @@ bool ParseCMAP( const unsigned char* pCmap, int nLength, 
CmapResult& rResult )
     sal_UCS4* pCodePairs = nullptr;
     int* pStartGlyphs = nullptr;
 
-    std::vector<sal_uInt16> aGlyphIdArray { 0 };
+    std::vector<sal_uInt16> aGlyphIdArray;
     aGlyphIdArray.reserve( 0x1000 );
+    aGlyphIdArray.push_back( 0 );
 
     // format 4, the most common 16bit char mapping table
     if( (nFormat == 4) && ((nOffset+16) < nLength) )