Skip to content

W
wine-cw
Commit 1ff4a8fa authored by Alex Henrie's avatar Alex Henrie Committed by Alexandre Julliard
Browse files
Options

winex11: Fix off-by-one error in color value scaling.

Signed-off-by: 's avatarAlex Henrie <alexhenrie24@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 19826fd6
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 12 deletions
dlls/winex11.drv/palette.c
View file @ 1ff4a8fa
......@@ -293,18 +293,18 @@ static BOOL X11DRV_PALETTE_BuildPrivateMap( const PALETTEENTRY *sys_pal_template
{
if( i < NB_RESERVED_COLORS/2 )
{
color.red = sys_pal_template[i].peRed * 65535 / 255;
color.green = sys_pal_template[i].peGreen * 65535 / 255;
color.blue = sys_pal_template[i].peBlue * 65535 / 255;
color.red = sys_pal_template[i].peRed * (65535 / 255);
color.green = sys_pal_template[i].peGreen * (65535 / 255);
color.blue = sys_pal_template[i].peBlue * (65535 / 255);
COLOR_sysPal[i] = sys_pal_template[i];
COLOR_sysPal[i].peFlags |= PC_SYS_USED;
}
else if( i >= palette_size - NB_RESERVED_COLORS/2 )
{
int j = NB_RESERVED_COLORS + i - palette_size;
color.red = sys_pal_template[j].peRed * 65535 / 255;
color.green = sys_pal_template[j].peGreen * 65535 / 255;
color.blue = sys_pal_template[j].peBlue * 65535 / 255;
color.red = sys_pal_template[j].peRed * (65535 / 255);
color.green = sys_pal_template[j].peGreen * (65535 / 255);
color.blue = sys_pal_template[j].peBlue * (65535 / 255);
COLOR_sysPal[i] = sys_pal_template[j];
COLOR_sysPal[i].peFlags |= PC_SYS_USED;
}
......@@ -633,9 +633,9 @@ static void X11DRV_PALETTE_FillDefaultColors( const PALETTEENTRY *sys_pal_templa
{
XColor color;
color.pixel = (X11DRV_PALETTE_PaletteToXPixel)? X11DRV_PALETTE_PaletteToXPixel[idx] : idx;
color.red = COLOR_sysPal[idx].peRed << 8;
color.green = COLOR_sysPal[idx].peGreen << 8;
color.blue = COLOR_sysPal[idx].peBlue << 8;
color.red = COLOR_sysPal[idx].peRed * (65535 / 255);
color.green = COLOR_sysPal[idx].peGreen * (65535 / 255);
color.blue = COLOR_sysPal[idx].peBlue * (65535 / 255);
color.flags = DoRed | DoGreen | DoBlue;
XStoreColor(gdi_display, default_colormap, &color);
}
......@@ -1156,9 +1156,9 @@ UINT CDECL X11DRV_RealizePalette( PHYSDEV dev, HPALETTE hpal, BOOL primary )
X11DRV_PALETTE_firstFree = X11DRV_PALETTE_freeList[index];
color.pixel = (X11DRV_PALETTE_PaletteToXPixel) ? X11DRV_PALETTE_PaletteToXPixel[index] : index;
color.red = entries[i].peRed << 8;
color.green = entries[i].peGreen << 8;
color.blue = entries[i].peBlue << 8;
color.red = entries[i].peRed * (65535 / 255);
color.green = entries[i].peGreen * (65535 / 255);
color.blue = entries[i].peBlue * (65535 / 255);
color.flags = DoRed | DoGreen | DoBlue;
XStoreColor(gdi_display, default_colormap, &color);
......
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