diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2014-03-22 23:15:59 +0100 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2014-03-22 23:15:59 +0100 |
| commit | ac466bc94eaea5356dc764564810e787b0536121 (patch) | |
| tree | aad24811dd71c433d39cd7ea633deab5fd6a97c0 /vcl | |
| parent | b79a361f25e10b71444369e5001bb0103daa1b5e (diff) | |
cppcheck: fix reassigned vars
Change-Id: I9038045b5756ca956febe5d2ab7b05d15c4a7bca
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/generic/glyphs/gcach_ftyp.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index eee46f4b68d3..92da831181eb 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -1020,8 +1020,7 @@ void ServerFont::InitGlyphData( sal_GlyphId aGlyphId, GlyphData& rGD ) const // if( mbArtItalic ) // nLoadFlags |= FT_LOAD_NO_BITMAP; - FT_Error rc = -1; - rc = FT_Load_Glyph( maFaceFT, aGlyphId, nLoadFlags ); + FT_Error rc = FT_Load_Glyph( maFaceFT, aGlyphId, nLoadFlags ); if( rc != FT_Err_Ok ) { @@ -1095,8 +1094,7 @@ bool ServerFont::GetGlyphBitmap1( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap ) if( mnPrioEmbedded <= mnPrioAutoHint ) nLoadFlags |= FT_LOAD_NO_BITMAP; - FT_Error rc = -1; - rc = FT_Load_Glyph( maFaceFT, aGlyphId, nLoadFlags ); + FT_Error rc = FT_Load_Glyph( maFaceFT, aGlyphId, nLoadFlags ); if( rc != FT_Err_Ok ) return false; @@ -1232,8 +1230,7 @@ bool ServerFont::GetGlyphBitmap8( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap ) if( mnPrioEmbedded <= mnPrioAntiAlias ) nLoadFlags |= FT_LOAD_NO_BITMAP; - FT_Error rc = -1; - rc = FT_Load_Glyph( maFaceFT, aGlyphId, nLoadFlags ); + FT_Error rc = FT_Load_Glyph( maFaceFT, aGlyphId, nLoadFlags ); if( rc != FT_Err_Ok ) return false; |