diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-13 07:31:50 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-13 07:31:50 +0000 |
| commit | ff08b39bd07fb13e179d4a5392f30eb858a93256 (patch) | |
| tree | 629ba8f5ece9df4bfccaf4594f84286ff965985d /vcl/source/glyphs/gcach_ftyp.cxx | |
| parent | 2fa896d797aa1aae9a5395e52a00506acd8e91b1 (diff) | |
INTEGRATION: CWS vcl65 (1.129.78); FILE MERGED
2006/09/05 14:50:28 pl 1.129.78.3: RESYNC: (1.129-1.130); FILE MERGED
2006/09/05 09:29:15 hdu 1.129.78.2: #i69259# clean up when FT_Glyph_To_Bitmap() failed
2006/08/25 12:01:13 hdu 1.129.78.1: #i68904# provide size hints for hash_* objects
Diffstat (limited to 'vcl/source/glyphs/gcach_ftyp.cxx')
| -rw-r--r-- | vcl/source/glyphs/gcach_ftyp.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/vcl/source/glyphs/gcach_ftyp.cxx b/vcl/source/glyphs/gcach_ftyp.cxx index 4f63358595b9..56c660510065 100644 --- a/vcl/source/glyphs/gcach_ftyp.cxx +++ b/vcl/source/glyphs/gcach_ftyp.cxx @@ -309,6 +309,8 @@ FtFontInfo::FtFontInfo( const ImplDevFontAttributes& rDevFontAttributes, mnSynthetic( nSynthetic ), mnFontId( nFontId ), maDevFontAttributes( rDevFontAttributes ), + maChar2Glyph( 0 ), + maGlyph2Char( 0 ), mpExtraKernInfo( pExtraKernInfo ) { // prefer font with low ID @@ -1352,7 +1354,10 @@ bool FreetypeServerFont::GetGlyphBitmap1( int nGlyphIndex, RawBitmap& rRawBitmap rc = FT_Glyph_To_Bitmap( &pGlyphFT, nRenderMode, NULL, TRUE ); if( rc != FT_Err_Ok ) + { + FT_Done_Glyph( pGlyphFT ); return false; + } } const FT_BitmapGlyph& rBmpGlyphFT = reinterpret_cast<const FT_BitmapGlyph&>(pGlyphFT); @@ -1501,7 +1506,10 @@ bool FreetypeServerFont::GetGlyphBitmap8( int nGlyphIndex, RawBitmap& rRawBitmap { rc = FT_Glyph_To_Bitmap( &pGlyphFT, FT_RENDER_MODE_NORMAL, NULL, TRUE ); if( rc != FT_Err_Ok ) + { + FT_Done_Glyph( pGlyphFT ); return false; + } } const FT_BitmapGlyph& rBmpGlyphFT = reinterpret_cast<const FT_BitmapGlyph&>(pGlyphFT); |