[Libreoffice-commits] core.git: 3 commits - vcl/generic

[Stephan Bergmann]

 vcl/generic/glyphs/gcach_ftyp.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 93d4362d9dff759408f79b1c1f8e6f36e281772c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Sep 7 15:55:26 2015 +0200

    clang-analyzer-deadcode.DeadStores
    
    ...needlessly added with 6d96720fd51ca4710c9ffef3db68ac13678f5bed "#98991# fix
    CJKV vertical glyph rotation, avoid obsolete FT helper functions"
    
    Change-Id: Ic0311ca8ae2b4c7d33c42f7fecaae4c95c24500a

diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index e105741..080bb82 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -1616,7 +1616,6 @@ bool ServerFont::ApplyGSUB( const FontSelectPattern& rFSD )
     const sal_uInt16 nOfsScriptList     = GetUShort( pGsubHeader+4 );
     const sal_uInt16 nOfsFeatureTable   = GetUShort( pGsubHeader+6 );
     const sal_uInt16 nOfsLookupList     = GetUShort( pGsubHeader+8 );
-    pGsubHeader += 10;
 
     typedef std::vector<sal_uInt16> UshortList;
     UshortList aFeatureIndexList;
commit 9f7254e2a2487c71696e41a00a5dd36d55b5d907
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Sep 7 15:50:03 2015 +0200

    clang-analyzer-deadcode.DeadStores
    
    ...ever since its inception with a949f50ce969b1f8d018d2913c0d86cfcec4e72a
    "implemented GetGlyphOutline()"
    
    Change-Id: I4591ac5c3d42053b3caa9d68bb12ad02dc319b66

diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index 0e1e504..e105741 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -1580,7 +1580,7 @@ bool ServerFont::GetGlyphOutline( sal_GlyphId aGlyphId,
     aFuncs.cubic_to = &FT_cubic_to;
     aFuncs.shift    = 0;
     aFuncs.delta    = 0;
-    rc = FT_Outline_Decompose( &rOutline, &aFuncs, static_cast<void*>(&aPolyArg) );
+    FT_Outline_Decompose( &rOutline, &aFuncs, static_cast<void*>(&aPolyArg) );
     aPolyArg.ClosePolygon();    // close last polygon
     FT_Done_Glyph( pGlyphFT );
 
commit d272d64e7cd3a71dc422c3250df869451c088c07
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Sep 7 15:46:11 2015 +0200

    clang-analyzer-deadcode.DeadStores
    
    ...ever since its inception with 2d1f08d63942666c0094904f50ba8c512ab69b9d
    "CWS-TOOLING: integrate CWS otf01"
    
    Change-Id: I92ec60f5704e632126f3ba98140c520ae5c9e784

diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index 1d1e1ac..0e1e504 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -1316,7 +1316,7 @@ bool FtFontInfo::GetFontCodeRanges( CmapResult& rResult ) const
         if( !nGlyphIndex )
             break;
         aCodes.push_back( cCode );  // first code inside range
-        sal_uInt32 cNext = cCode;
+        sal_uInt32 cNext;
         do cNext = FT_Get_Next_Char( maFaceFT, cCode, &nGlyphIndex ); while( cNext == ++cCode );
         aCodes.push_back( cCode );  // first code outside range
         cCode = cNext;