2009/1/27 Kai Blin kai.blin@gmail.com:
lcdfilter = FT_LCD_FILTER_DEFAULT is hardcoded, so the check is always true.
This fixes Coverity CID 816
diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 1ca6953..dfbcf2f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4783,18 +4783,15 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, (format == WINE_GGO_HRGB_BITMAP || format == WINE_GGO_HBGR_BITMAP)? FT_RENDER_MODE_LCD: FT_RENDER_MODE_LCD_V;
if ( lcdfilter == FT_LCD_FILTER_DEFAULT || lcdfilter == FT_LCD_FILTER_LIGHT )
if ( render_mode == FT_RENDER_MODE_LCD) {
if ( render_mode == FT_RENDER_MODE_LCD){lpgm->gmBlackBoxX += 2;lpgm->gmptGlyphOrigin.x -= 1;}else{lpgm->gmBlackBoxY += 2;lpgm->gmptGlyphOrigin.y += 1;}
lpgm->gmBlackBoxX += 2;lpgm->gmptGlyphOrigin.x -= 1;}else{lpgm->gmBlackBoxY += 2;lpgm->gmptGlyphOrigin.y += 1; } width = lpgm->gmBlackBoxX;
It doesn't make much sense to leave the lcdfilter variable in the function if you're going to remove the if condition depending on it, since it only has one other use. However, It might have been the intention of the author of this code that this is setting to be changed at compile time (or runtime through a registry tweak) and have the code do the appropriate thing - in that case it would have been better to put the variable at the top of the file.
On Tuesday 27 January 2009 18:29:10 Rob Shearman wrote:
It doesn't make much sense to leave the lcdfilter variable in the function if you're going to remove the if condition depending on it, since it only has one other use. However, It might have been the intention of the author of this code that this is setting to be changed at compile time (or runtime through a registry tweak) and have the code do the appropriate thing - in that case it would have been better to put the variable at the top of the file.
I actually have no idea. This was the smallest possible fix that addressed the coverity issue, but I agree that we need to do something with the lcdfilter variable.
Looking at the commits responsible for the lcdfilter assignment (028617b9) and the if check (45a081f1), I don't see anything that hints at why there's an if check with lcdfilter hardcoded. CCing the original author.
Cheers, Kai
From: kai.blin@gmail.com To: robertshearman@gmail.com Subject: Re: gdi32: Remove unneeded check. (Coverity) Date: Wed, 28 Jan 2009 10:32:40 +0100 CC: wine-devel@winehq.org
On Tuesday 27 January 2009 18:29:10 Rob Shearman wrote:
It doesn't make much sense to leave the lcdfilter variable in the function if you're going to remove the if condition depending on it, since it only has one other use. However, It might have been the intention of the author of this code that this is setting to be changed at compile time (or runtime through a registry tweak) and have the code do the appropriate thing - in that case it would have been better to put the variable at the top of the file.
I actually have no idea. This was the smallest possible fix that addressed the coverity issue, but I agree that we need to do something with the lcdfilter variable.
Looking at the commits responsible for the lcdfilter assignment (028617b9) and the if check (45a081f1), I don't see anything that hints at why there's an if check with lcdfilter hardcoded. CCing the original author.
Cheers, Kai
-- Kai Blin WorldForge developer http://www.worldforge.org/ Wine developer http://wiki.winehq.org/KaiBlin Samba team member http://www.samba.org/samba/team/ -- Will code for cotton.
_________________________________________________________________ Hotmail® goes where you go. On a PC, on the Web, on your phone. http://www.windowslive-hotmail.com/learnmore/versatility.aspx#mobile?ocid=TX...
-
EA Durbin -
Kai Blin -
Rob Shearman