Skip to content

W
wine-winehq
Commit c8d61899 authored by Dmitry Timoshkov's avatar Dmitry Timoshkov Committed by Alexandre Julliard
Browse files
Options

gdi32: Make sure that pattern info is initialized before being used.

parent 40bda4a0
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
dlls/gdi32/dibdrv/objects.c
View file @ c8d61899
......@@ -1897,9 +1897,6 @@ static BOOL select_pattern_brush( dibdrv_physdev *pdev, dib_brush *brush, BOOL *
dib_info pattern;
BOOL dither = (brush->dib.bit_count == 1);
if (pattern.bit_count == 1 && !pattern.color_table)
dither = FALSE; /* monochrome DDB pattern brushes don't get dithered */
if (brush->pattern.info->bmiHeader.biClrUsed && brush->pattern.usage == DIB_PAL_COLORS)
{
copy_bitmapinfo( info, brush->pattern.info );
......@@ -1912,6 +1909,9 @@ static BOOL select_pattern_brush( dibdrv_physdev *pdev, dib_brush *brush, BOOL *
init_dib_info_from_bitmapinfo( &pattern, brush->pattern.info, brush->pattern.bits.ptr );
}
if (pattern.bit_count == 1 && !pattern.color_table)
dither = FALSE; /* monochrome DDB pattern brushes don't get dithered */
if (pattern.bit_count == 1 && !pattern.color_table &&
(pdev->dib.bit_count != 1 || pdev->dib.color_table))
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment