summaryrefslogtreecommitdiff
path: root/vcl/generic
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-10-10 10:33:16 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-10-10 12:50:19 +0100
commit8e1b4b8109ed2154a44ef6491cddc180cc8616b8 (patch)
tree4c4ee97263741b42f43b880203bbee198c6786ec /vcl/generic
parent03327cbd668eeb9ef4cf1ede66c3f27e7303c122 (diff)
coverity738920 Uninitialized scalar field
Change-Id: Ic1571d24a8a696dc24b899d262b9e560d005ee88
Diffstat (limited to 'vcl/generic')
-rw-r--r--vcl/generic/glyphs/gcach_ftyp.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index fa93fc603738..4a8ddd014ded 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -489,8 +489,6 @@ ServerFont::ServerFont( const FontSelectPattern& rFSD, FtFontInfo* pFI )
static_cast<ImplServerFontEntry*>(rFSD.mpFontEntry)->SetServerFont( this );
maFaceFT = pFI->GetFaceFT();
- if( !maFaceFT )
- return;
if( rFSD.mnOrientation != 0 )
{
@@ -508,6 +506,9 @@ ServerFont::ServerFont( const FontSelectPattern& rFSD, FtFontInfo* pFI )
if( (mnWidth < 0) || (mfStretch > +64.0) || (mfStretch < -64.0) )
return;
+ if( !maFaceFT )
+ return;
+
FT_New_Size( maFaceFT, &maSizeFT );
FT_Activate_Size( maSizeFT );
FT_Error rc = FT_Set_Pixel_Sizes( maFaceFT, mnWidth, rFSD.mnHeight );