mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

coverity#738920 Uninitialized scalar field

Browse Source 
Change-Id: I4796075c4727d30178bb6c7d0752e87ab22c36cf
This commit is contained in:
Caolán McNamara
2014-04-26 13:33:02 +01:00
parent 9ec73ef4c9
commit 5da0eb4d45
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
vcl/generic/glyphs/gcach_ftyp.cxx
View File

@@ -475,9 +475,13 @@ ServerFont::ServerFont( const FontSelectPattern& rFSD, FtFontInfo* pFI )
mnPrioAntiAlias(nDefaultPrioAntiAlias), mnPrioAntiAlias(nDefaultPrioAntiAlias),
mnPrioAutoHint(nDefaultPrioAutoHint), mnPrioAutoHint(nDefaultPrioAutoHint),
mpFontInfo( pFI ), mpFontInfo( pFI ),
mnLoadFlags( 0 ),
maFaceFT( NULL ), maFaceFT( NULL ),
maSizeFT( NULL ), maSizeFT( NULL ),
mbFaceOk( false ), mbFaceOk( false ),
mbArtItalic( false ),
mbArtBold( false ),
mbUseGamma( false ),
mpLayoutEngine( NULL ) mpLayoutEngine( NULL )
{ {
// TODO: move update of mpFontEntry into FontEntry class when // TODO: move update of mpFontEntry into FontEntry class when
@@ -491,11 +495,6 @@ ServerFont::ServerFont( const FontSelectPattern& rFSD, FtFontInfo* pFI )
mnSin = static_cast<long>( 0x10000 * sin( dRad ) + 0.5 ); mnSin = static_cast<long>( 0x10000 * sin( dRad ) + 0.5 );
} }
maFaceFT = pFI->GetFaceFT();
if( !maFaceFT )
return;
// set the pixel size of the font instance // set the pixel size of the font instance
mnWidth = rFSD.mnWidth; mnWidth = rFSD.mnWidth;
if( !mnWidth ) if( !mnWidth )
@@ -505,6 +504,10 @@ ServerFont::ServerFont( const FontSelectPattern& rFSD, FtFontInfo* pFI )
if( (mnWidth < 0) || (mfStretch > +64.0) || (mfStretch < -64.0) ) if( (mnWidth < 0) || (mfStretch > +64.0) || (mfStretch < -64.0) )
return; return;
maFaceFT = pFI->GetFaceFT();
if( !maFaceFT )
return;
FT_New_Size( maFaceFT, &maSizeFT ); FT_New_Size( maFaceFT, &maSizeFT );
FT_Activate_Size( maSizeFT ); FT_Activate_Size( maSizeFT );
FT_Error rc = FT_Set_Pixel_Sizes( maFaceFT, mnWidth, rFSD.mnHeight ); FT_Error rc = FT_Set_Pixel_Sizes( maFaceFT, mnWidth, rFSD.mnHeight );
@@ -535,7 +538,6 @@ ServerFont::ServerFont( const FontSelectPattern& rFSD, FtFontInfo* pFI )
mbArtItalic = (rFSD.GetSlant() != ITALIC_NONE && pFI->GetFontAttributes().GetSlant() == ITALIC_NONE); mbArtItalic = (rFSD.GetSlant() != ITALIC_NONE && pFI->GetFontAttributes().GetSlant() == ITALIC_NONE);
mbArtBold = (rFSD.GetWeight() > WEIGHT_MEDIUM && pFI->GetFontAttributes().GetWeight() <= WEIGHT_MEDIUM); mbArtBold = (rFSD.GetWeight() > WEIGHT_MEDIUM && pFI->GetFontAttributes().GetWeight() <= WEIGHT_MEDIUM);
mbUseGamma = false;
if( mbArtBold ) if( mbArtBold )
{ {
//static const int TT_CODEPAGE_RANGE_874 = (1L << 16); // Thai //static const int TT_CODEPAGE_RANGE_874 = (1L << 16); // Thai