Module: wine Branch: master Commit: 45f240c0cbefee748ea8380357649abddf8d03f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45f240c0cbefee748ea8380357...
Author: Dmitry Timoshkov dmitry@baikal.ru Date: Thu Jul 12 16:14:11 2012 +0900
windowscodecs: Add support for generating WICBitmapPaletteTypeFixedHalftone256 palette.
---
dlls/windowscodecs/palette.c | 26 ++++++++++++++++++++++++++ dlls/windowscodecs/tests/palette.c | 20 ++++++++++++++++++++ 2 files changed, 46 insertions(+), 0 deletions(-)
diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index a024cd1..4541c7c 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -188,6 +188,27 @@ static WICColor *generate_halftone64_palette(UINT *count) return entries; }
+static WICColor *generate_halftone256_palette(UINT *count) +{ + WICColor *entries; + UINT i; + + *count = 256; + entries = HeapAlloc(GetProcessHeap(), 0, 256 * sizeof(WICColor)); + if (!entries) return NULL; + + for (i = 0; i < 256; i++) + { + static const BYTE halftone_values_b[4] = { 0x00,0x55,0xaa,0xff }; + static const BYTE halftone_values_gr[8] = { 0x00,0x24,0x49,0x6d,0x92,0xb6,0xdb,0xff }; + entries[i] = 0xff000000; + entries[i] |= halftone_values_b[i%4]; + entries[i] |= halftone_values_gr[(i/4)%8] << 8; + entries[i] |= halftone_values_gr[(i/32)%8] << 16; + } + return entries; +} + static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, WICBitmapPaletteType type, BOOL add_transparent) { @@ -237,6 +258,11 @@ static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, if (!colors) return E_OUTOFMEMORY; break;
+ case WICBitmapPaletteTypeFixedHalftone256: + colors = generate_halftone256_palette(&count); + if (!colors) return E_OUTOFMEMORY; + break; + default: FIXME("(%p,%u,%d): stub\n", iface, type, add_transparent); return E_NOTIMPL; diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index e97ffc6..8e320c5 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -223,6 +223,23 @@ static void generate_halftone64_palette(DWORD *entries, UINT count) } }
+static void generate_halftone256_palette(DWORD *entries, UINT count) +{ + static const BYTE halftone_values_b[4] = { 0x00,0x55,0xaa,0xff }; + static const BYTE halftone_values_gr[8] = { 0x00,0x24,0x49,0x6d,0x92,0xb6,0xdb,0xff }; + UINT i; + + assert(count == 256); + + for (i = 0; i < 256; i++) + { + entries[i] = 0xff000000; + entries[i] |= halftone_values_b[i%4]; + entries[i] |= halftone_values_gr[(i/4)%8] << 8; + entries[i] |= halftone_values_gr[(i/32)%8] << 16; + } +} + static void test_predefined_palette(void) { static struct test_data @@ -240,6 +257,7 @@ static void test_predefined_palette(void) { WICBitmapPaletteTypeFixedGray256, 0, 1, 256, { 0 } }, { WICBitmapPaletteTypeFixedHalftone8, 0, 0, 16, { 0 } }, { WICBitmapPaletteTypeFixedHalftone64, 0, 0, 72, { 0 } }, + { WICBitmapPaletteTypeFixedHalftone256, 0, 0, 256, { 0 } }, }; IWICImagingFactory *factory; IWICPalette *palette; @@ -298,6 +316,8 @@ static void test_predefined_palette(void) generate_halftone8_palette(td[i].color, td[i].count); else if (td[i].type == WICBitmapPaletteTypeFixedHalftone64) generate_halftone64_palette(td[i].color, td[i].count); + else if (td[i].type == WICBitmapPaletteTypeFixedHalftone256) + generate_halftone256_palette(td[i].color, td[i].count);
for (j = 0; j < count; j++) {