Huw Davies : gdi32: Add support for 1 bpp brushes.
Alexandre Julliard
julliard at winehq.org
Wed Jun 15 13:43:01 CDT 2011
Module: wine
Branch: master
Commit: 0aacdc0d8558d9311c48e47f4c1f790181c32c91
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aacdc0d8558d9311c48e47f4c1f790181c32c91
Author: Huw Davies <huw at codeweavers.com>
Date: Wed Jun 15 13:43:51 2011 +0100
gdi32: Add support for 1 bpp brushes.
---
dlls/gdi32/dibdrv/primitives.c | 197 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 197 insertions(+), 0 deletions(-)
diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c
index f3d2130..c6751db 100644
--- a/dlls/gdi32/dibdrv/primitives.c
+++ b/dlls/gdi32/dibdrv/primitives.c
@@ -847,6 +847,27 @@ static BOOL convert_to_8888(dib_info *dst, const dib_info *src, const RECT *src_
break;
}
+ case 1:
+ {
+ BYTE *src_start = get_pixel_ptr_1(src, src_rect->left, src_rect->top), *src_pixel;
+ for(y = src_rect->top; y < src_rect->bottom; y++)
+ {
+ dst_pixel = dst_start;
+ src_pixel = src_start;
+ for(x = src_rect->left; x < src_rect->right; x++)
+ {
+ RGBQUAD rgb;
+ src_val = (*src_pixel & pixel_masks_1[x % 8]) ? 1 : 0;
+ if((x % 8) == 7) src_pixel++;
+ rgb = src->color_table[src_val];
+ *dst_pixel++ = rgb.rgbRed << 16 | rgb.rgbGreen << 8 | rgb.rgbBlue;
+ }
+ dst_start += dst->stride / 4;
+ src_start += src->stride;
+ }
+ break;
+ }
+
default:
FIXME("Unsupported conversion: %d -> 8888\n", src->bit_count);
return FALSE;
@@ -993,6 +1014,29 @@ static BOOL convert_to_32(dib_info *dst, const dib_info *src, const RECT *src_re
break;
}
+ case 1:
+ {
+ BYTE *src_start = get_pixel_ptr_1(src, src_rect->left, src_rect->top), *src_pixel;
+ for(y = src_rect->top; y < src_rect->bottom; y++)
+ {
+ dst_pixel = dst_start;
+ src_pixel = src_start;
+ for(x = src_rect->left; x < src_rect->right; x++)
+ {
+ RGBQUAD rgb;
+ src_val = (*src_pixel & pixel_masks_1[x % 8]) ? 1 : 0;
+ if((x % 8) == 7) src_pixel++;
+ rgb = src->color_table[src_val];
+ *dst_pixel++ = put_field(rgb.rgbRed, dst->red_shift, dst->red_len) |
+ put_field(rgb.rgbGreen, dst->green_shift, dst->green_len) |
+ put_field(rgb.rgbBlue, dst->blue_shift, dst->blue_len);
+ }
+ dst_start += dst->stride / 4;
+ src_start += src->stride;
+ }
+ break;
+ }
+
default:
FIXME("Unsupported conversion: %d -> 32\n", src->bit_count);
return FALSE;
@@ -1132,6 +1176,29 @@ static BOOL convert_to_24(dib_info *dst, const dib_info *src, const RECT *src_re
break;
}
+ case 1:
+ {
+ BYTE *src_start = get_pixel_ptr_1(src, src_rect->left, src_rect->top), *src_pixel;
+ for(y = src_rect->top; y < src_rect->bottom; y++)
+ {
+ dst_pixel = dst_start;
+ src_pixel = src_start;
+ for(x = src_rect->left; x < src_rect->right; x++)
+ {
+ RGBQUAD rgb;
+ src_val = (*src_pixel & pixel_masks_1[x % 8]) ? 1 : 0;
+ if((x % 8) == 7) src_pixel++;
+ rgb = src->color_table[src_val];
+ *dst_pixel++ = rgb.rgbBlue;
+ *dst_pixel++ = rgb.rgbGreen;
+ *dst_pixel++ = rgb.rgbRed;
+ }
+ dst_start += dst->stride;
+ src_start += src->stride;
+ }
+ break;
+ }
+
default:
FIXME("Unsupported conversion: %d -> 24\n", src->bit_count);
return FALSE;
@@ -1276,6 +1343,29 @@ static BOOL convert_to_555(dib_info *dst, const dib_info *src, const RECT *src_r
break;
}
+ case 1:
+ {
+ BYTE *src_start = get_pixel_ptr_1(src, src_rect->left, src_rect->top), *src_pixel;
+ for(y = src_rect->top; y < src_rect->bottom; y++)
+ {
+ dst_pixel = dst_start;
+ src_pixel = src_start;
+ for(x = src_rect->left; x < src_rect->right; x++)
+ {
+ RGBQUAD rgb;
+ src_val = (*src_pixel & pixel_masks_1[x % 8]) ? 1 : 0;
+ if((x % 8) == 7) src_pixel++;
+ rgb = src->color_table[src_val];
+ *dst_pixel++ = ((rgb.rgbRed << 7) & 0x7c00) |
+ ((rgb.rgbGreen << 2) & 0x03e0) |
+ ((rgb.rgbBlue >> 3) & 0x001f);
+ }
+ dst_start += dst->stride / 2;
+ src_start += src->stride;
+ }
+ break;
+ }
+
default:
FIXME("Unsupported conversion: %d -> 555\n", src->bit_count);
return FALSE;
@@ -1423,6 +1513,29 @@ static BOOL convert_to_16(dib_info *dst, const dib_info *src, const RECT *src_re
break;
}
+ case 1:
+ {
+ BYTE *src_start = get_pixel_ptr_1(src, src_rect->left, src_rect->top), *src_pixel;
+ for(y = src_rect->top; y < src_rect->bottom; y++)
+ {
+ dst_pixel = dst_start;
+ src_pixel = src_start;
+ for(x = src_rect->left; x < src_rect->right; x++)
+ {
+ RGBQUAD rgb;
+ src_val = (*src_pixel & pixel_masks_1[x % 8]) ? 1 : 0;
+ if((x % 8) == 7) src_pixel++;
+ rgb = src->color_table[src_val];
+ *dst_pixel++ = put_field(rgb.rgbRed, dst->red_shift, dst->red_len) |
+ put_field(rgb.rgbGreen, dst->green_shift, dst->green_len) |
+ put_field(rgb.rgbBlue, dst->blue_shift, dst->blue_len);
+ }
+ dst_start += dst->stride / 2;
+ src_start += src->stride;
+ }
+ break;
+ }
+
default:
FIXME("Unsupported conversion: %d -> 16\n", src->bit_count);
return FALSE;
@@ -1592,6 +1705,27 @@ static BOOL convert_to_8(dib_info *dst, const dib_info *src, const RECT *src_rec
break;
}
+ case 1:
+ {
+ BYTE *src_start = get_pixel_ptr_1(src, src_rect->left, src_rect->top), *src_pixel;
+ for(y = src_rect->top; y < src_rect->bottom; y++)
+ {
+ dst_pixel = dst_start;
+ src_pixel = src_start;
+ for(x = src_rect->left; x < src_rect->right; x++)
+ {
+ RGBQUAD rgb;
+ src_val = (*src_pixel & pixel_masks_1[x % 8]) ? 1 : 0;
+ if((x % 8) == 7) src_pixel++;
+ rgb = src->color_table[src_val];
+ *dst_pixel++ = colorref_to_pixel_colortable(dst, RGB(rgb.rgbRed, rgb.rgbGreen, rgb.rgbBlue));
+ }
+ dst_start += dst->stride;
+ src_start += src->stride;
+ }
+ break;
+ }
+
default:
FIXME("Unsupported conversion: %d -> 8\n", src->bit_count);
return FALSE;
@@ -1790,6 +1924,34 @@ static BOOL convert_to_4(dib_info *dst, const dib_info *src, const RECT *src_rec
break;
}
+ case 1:
+ {
+ BYTE *src_start = get_pixel_ptr_1(src, src_rect->left, src_rect->top), *src_pixel;
+ for(y = src_rect->top; y < src_rect->bottom; y++)
+ {
+ dst_pixel = dst_start;
+ src_pixel = src_start;
+ for(x = src_rect->left; x < src_rect->right; x++)
+ {
+ RGBQUAD rgb;
+ src_val = (*src_pixel & pixel_masks_1[x % 8]) ? 1 : 0;
+ if((x % 8) == 7) src_pixel++;
+ rgb = src->color_table[src_val];
+ dst_val = colorref_to_pixel_colortable(dst, RGB(rgb.rgbRed, rgb.rgbGreen, rgb.rgbBlue));
+ if((x - src_rect->left) & 1)
+ {
+ *dst_pixel = (dst_val & 0x0f) | (*dst_pixel & 0xf0);
+ dst_pixel++;
+ }
+ else
+ *dst_pixel = (dst_val << 4) & 0xf0;
+ }
+ dst_start += dst->stride;
+ src_start += src->stride;
+ }
+ break;
+ }
+
default:
FIXME("Unsupported conversion: %d -> 4\n", src->bit_count);
return FALSE;
@@ -1984,6 +2146,41 @@ static BOOL convert_to_1(dib_info *dst, const dib_info *src, const RECT *src_rec
break;
}
+ /* Note that while MSDN states that a 1 bpp dib brush -> mono dc
+ uses text/bkgnd colours instead of the dib's colour table, this
+ doesn't appear to be the case for a dc backed by a
+ dibsection. */
+
+ case 1:
+ {
+ BYTE *src_start = get_pixel_ptr_1(src, src_rect->left, src_rect->top), *src_pixel;
+ for(y = src_rect->top; y < src_rect->bottom; y++)
+ {
+ dst_pixel = dst_start;
+ src_pixel = src_start;
+ for(x = src_rect->left, bit_pos = 0; x < src_rect->right; x++)
+ {
+ RGBQUAD rgb;
+ src_val = (*src_pixel & pixel_masks_1[x % 8]) ? 1 : 0;
+ if((x % 8) == 7) src_pixel++;
+ rgb = src->color_table[src_val];
+ dst_val = colorref_to_pixel_colortable(dst, RGB(rgb.rgbRed, rgb.rgbGreen, rgb.rgbBlue)) ? 0xff : 0;
+
+ if(bit_pos == 0) *dst_pixel = 0;
+ *dst_pixel = (*dst_pixel & ~pixel_masks_1[bit_pos]) | (dst_val & pixel_masks_1[bit_pos]);
+
+ if(++bit_pos == 8)
+ {
+ dst_pixel++;
+ bit_pos = 0;
+ }
+ }
+ dst_start += dst->stride;
+ src_start += src->stride;
+ }
+ break;
+ }
+
default:
FIXME("Unsupported conversion: %d -> 1\n", src->bit_count);
return FALSE;
More information about the wine-cvs
mailing list