ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- correct number of colormap entries looked at in GetDIBColorTable. 

- correct number of colormap entries processed in SetDIBColorTable.
This commit is contained in:
Guy L. Albertelli 2000-12-05 03:53:23 +00:00 committed by Alexandre Julliard
parent 9ae2f15d53
commit 7897de4ef8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
graphics/x11drv/dib.c
View File

@ -3659,7 +3659,7 @@ UINT X11DRV_DIB_SetDIBColorTable(BITMAPOBJ *bmp, DC *dc, UINT start, UINT count,
if (dib && dib->colorMap) { if (dib && dib->colorMap) {
X11DRV_DIB_GenColorMap( dc, dib->colorMap, DIB_RGB_COLORS, dib->dibSection.dsBm.bmBitsPixel, X11DRV_DIB_GenColorMap( dc, dib->colorMap, DIB_RGB_COLORS, dib->dibSection.dsBm.bmBitsPixel,
TRUE, colors, start, count - start ); TRUE, colors, start, count + start );
return count; return count;
} }
return 0; return 0;
@ -3673,7 +3673,8 @@ UINT X11DRV_DIB_GetDIBColorTable(BITMAPOBJ *bmp, DC *dc, UINT start, UINT count,
X11DRV_DIBSECTION *dib = (X11DRV_DIBSECTION *) bmp->dib; X11DRV_DIBSECTION *dib = (X11DRV_DIBSECTION *) bmp->dib;
if (dib && dib->colorMap) { if (dib && dib->colorMap) {
int i, end = count - start; int i, end = count + start;
if (end > dib->nColorMap) end = dib->nColorMap;
for (i = start; i < end; i++,colors++) { for (i = start; i < end; i++,colors++) {
COLORREF col = X11DRV_PALETTE_ToLogical( dib->colorMap[i] ); COLORREF col = X11DRV_PALETTE_ToLogical( dib->colorMap[i] );
colors->rgbBlue = GetBValue(col); colors->rgbBlue = GetBValue(col);
@ -3681,7 +3682,7 @@ UINT X11DRV_DIB_GetDIBColorTable(BITMAPOBJ *bmp, DC *dc, UINT start, UINT count,
colors->rgbRed = GetRValue(col); colors->rgbRed = GetRValue(col);
colors->rgbReserved = 0; colors->rgbReserved = 0;
} }
return count; return end-start;
} }
return 0; return 0;
} }