Skip to content

W
wine-cw
Commit 1fba2ee2 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

winex11: Bytes per line is signed so make it an int instead of a DWORD.

parent fcd561b9
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 13 deletions
dlls/winex11.drv/dib.c
View file @ 1fba2ee2
......@@ -522,7 +522,7 @@ static inline int X11DRV_DIB_CheckMask(int red_mask, int green_mask, int blue_ma
*/
static void X11DRV_DIB_SetImageBits_1( int lines, const BYTE *srcbits,
DWORD srcwidth, DWORD dstwidth, int left,
int *colors, XImage *bmpImage, DWORD linebytes)
int *colors, XImage *bmpImage, int linebytes)
{
int h, width;
const BYTE* srcbyte;
......@@ -581,7 +581,7 @@ static void X11DRV_DIB_SetImageBits_1( int lines, const BYTE *srcbits,
static void X11DRV_DIB_GetImageBits_1( int lines, BYTE *dstbits,
DWORD dstwidth, DWORD srcwidth,
RGBQUAD *colors, PALETTEENTRY *srccolors,
XImage *bmpImage, DWORD linebytes )
XImage *bmpImage, int linebytes )
{
DWORD x;
int h, width = min(dstwidth, srcwidth);
......@@ -923,7 +923,7 @@ static void X11DRV_DIB_GetImageBits_1( int lines, BYTE *dstbits,
*/
static void X11DRV_DIB_SetImageBits_4( int lines, const BYTE *srcbits,
DWORD srcwidth, DWORD dstwidth, int left,
int *colors, XImage *bmpImage, DWORD linebytes)
int *colors, XImage *bmpImage, int linebytes)
{
int h, width;
const BYTE* srcbyte;
......@@ -966,7 +966,7 @@ static void X11DRV_DIB_SetImageBits_4( int lines, const BYTE *srcbits,
static void X11DRV_DIB_GetImageBits_4( int lines, BYTE *dstbits,
DWORD srcwidth, DWORD dstwidth,
RGBQUAD *colors, PALETTEENTRY *srccolors,
XImage *bmpImage, DWORD linebytes )
XImage *bmpImage, int linebytes )
{
DWORD x;
int h, width = min(srcwidth, dstwidth);
......@@ -1442,7 +1442,7 @@ static void X11DRV_DIB_SetImageBits_RLE4( int lines, const BYTE *bits,
static void X11DRV_DIB_SetImageBits_8( int lines, const BYTE *srcbits,
DWORD srcwidth, DWORD dstwidth, int left,
const int *colors, XImage *bmpImage,
DWORD linebytes )
int linebytes )
{
DWORD x;
int h, width = min(srcwidth, dstwidth);
......@@ -1565,7 +1565,7 @@ static void X11DRV_DIB_SetImageBits_8( int lines, const BYTE *srcbits,
static void X11DRV_DIB_GetImageBits_8( int lines, BYTE *dstbits,
DWORD srcwidth, DWORD dstwidth,
RGBQUAD *colors, PALETTEENTRY *srccolors,
XImage *bmpImage, DWORD linebytes )
XImage *bmpImage, int linebytes )
{
DWORD x;
int h, width = min(srcwidth, dstwidth);
......@@ -1938,9 +1938,9 @@ static void X11DRV_DIB_SetImageBits_RLE8( int lines, const BYTE *bits,
* SetDIBits for a 16-bit deep DIB.
*/
static void X11DRV_DIB_SetImageBits_16( int lines, const BYTE *srcbits,
DWORD srcwidth, DWORD dstwidth, int left,
X11DRV_PDEVICE *physDev, DWORD rSrc, DWORD gSrc, DWORD bSrc,
XImage *bmpImage, DWORD linebytes )
DWORD srcwidth, DWORD dstwidth, int left,
X11DRV_PDEVICE *physDev, DWORD rSrc, DWORD gSrc, DWORD bSrc,
XImage *bmpImage, int linebytes )
{
DWORD x;
int h, width = min(srcwidth, dstwidth);
......@@ -2205,14 +2205,12 @@ static void X11DRV_DIB_GetImageBits_16( int lines, BYTE *dstbits,
DWORD dstwidth, DWORD srcwidth,
PALETTEENTRY *srccolors,
DWORD rDst, DWORD gDst, DWORD bDst,
XImage *bmpImage, DWORD dibpitch )
XImage *bmpImage, int linebytes )
{
DWORD x;
int h, width = min(srcwidth, dstwidth);
const dib_conversions *convs = (bmpImage->byte_order == LSBFirst) ? &dib_normal : &dib_src_byteswap;
DWORD linebytes = dibpitch;
if (lines < 0 )
{
lines = -lines;
......@@ -3182,7 +3180,7 @@ static void X11DRV_DIB_GetImageBits_32( int lines, BYTE *dstbits,
DWORD dstwidth, DWORD srcwidth,
PALETTEENTRY *srccolors,
DWORD rDst, DWORD gDst, DWORD bDst,
XImage *bmpImage, DWORD linebytes )
XImage *bmpImage, int linebytes )
{
DWORD x;
int h, width = min(srcwidth, dstwidth);
......
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