vcl/generic/glyphs/gcach_ftyp.cxx | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
New commits: commit ac466bc94eaea5356dc764564810e787b0536121 Author: Julien Nabet <serval2...@yahoo.fr> Date: Sat Mar 22 23:15:59 2014 +0100 cppcheck: fix reassigned vars Change-Id: I9038045b5756ca956febe5d2ab7b05d15c4a7bca diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index eee46f4..92da831 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; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits