Dmitry Timoshkov : windowscodecs: Add support for generating WICBitmapPaletteTypeFixedHalftone125 palette.
Alexandre Julliard
julliard at winehq.org
Mon Jul 23 13:54:23 CDT 2012
Module: wine
Branch: master
Commit: 97464c508fec781f2aa4ecfbdc8f88d55008f6b6
URL: http://source.winehq.org/git/wine.git/?a=commit;h=97464c508fec781f2aa4ecfbdc8f88d55008f6b6
Author: Dmitry Timoshkov <dmitry at baikal.ru>
Date: Mon Jul 23 12:44:54 2012 +0900
windowscodecs: Add support for generating WICBitmapPaletteTypeFixedHalftone125 palette.
---
dlls/windowscodecs/palette.c | 27 +++++++++++++++++++++++++++
dlls/windowscodecs/tests/palette.c | 21 +++++++++++++++++++++
2 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c
index 74438f6..a4124a7 100644
--- a/dlls/windowscodecs/palette.c
+++ b/dlls/windowscodecs/palette.c
@@ -210,6 +210,28 @@ static WICColor *generate_halftone64_palette(UINT *count)
return entries;
}
+static WICColor *generate_halftone125_palette(UINT *count)
+{
+ WICColor *entries;
+ UINT i;
+
+ *count = 126;
+ entries = HeapAlloc(GetProcessHeap(), 0, 126 * sizeof(WICColor));
+ if (!entries) return NULL;
+
+ for (i = 0; i < 125; i++)
+ {
+ static const BYTE halftone_values[5] = { 0x00,0x40,0x80,0xbf,0xff };
+ entries[i] = 0xff000000;
+ entries[i] |= halftone_values[i%5];
+ entries[i] |= halftone_values[(i/5)%5] << 8;
+ entries[i] |= halftone_values[(i/25)%5] << 16;
+ }
+
+ entries[i] = 0xffc0c0c0;
+ return entries;
+}
+
static WICColor *generate_halftone256_palette(UINT *count)
{
WICColor *entries;
@@ -285,6 +307,11 @@ static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface,
if (!colors) return E_OUTOFMEMORY;
break;
+ case WICBitmapPaletteTypeFixedHalftone125:
+ colors = generate_halftone125_palette(&count);
+ if (!colors) return E_OUTOFMEMORY;
+ break;
+
case WICBitmapPaletteTypeFixedHalftone256:
colors = generate_halftone256_palette(&count);
if (!colors) return E_OUTOFMEMORY;
diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c
index 7c4c3d4..32dbfc9 100644
--- a/dlls/windowscodecs/tests/palette.c
+++ b/dlls/windowscodecs/tests/palette.c
@@ -241,6 +241,24 @@ static void generate_halftone64_palette(DWORD *entries, UINT count)
}
}
+static void generate_halftone125_palette(DWORD *entries, UINT count)
+{
+ static const BYTE halftone_values[5] = { 0x00,0x40,0x80,0xbf,0xff };
+ UINT i;
+
+ assert(count == 126);
+
+ for (i = 0; i < 125; i++)
+ {
+ entries[i] = 0xff000000;
+ entries[i] |= halftone_values[i%5];
+ entries[i] |= halftone_values[(i/5)%5] << 8;
+ entries[i] |= halftone_values[(i/25)%5] << 16;
+ }
+
+ entries[i] = 0xffc0c0c0;
+}
+
static void generate_halftone256_palette(DWORD *entries, UINT count)
{
static const BYTE halftone_values_b[4] = { 0x00,0x55,0xaa,0xff };
@@ -276,6 +294,7 @@ static void test_predefined_palette(void)
{ WICBitmapPaletteTypeFixedHalftone8, 0, 0, 16, { 0 } },
{ WICBitmapPaletteTypeFixedHalftone27, 0, 0, 28, { 0 } },
{ WICBitmapPaletteTypeFixedHalftone64, 0, 0, 72, { 0 } },
+ { WICBitmapPaletteTypeFixedHalftone125, 0, 0, 126, { 0 } },
{ WICBitmapPaletteTypeFixedHalftone256, 0, 0, 256, { 0 } },
};
IWICImagingFactory *factory;
@@ -337,6 +356,8 @@ static void test_predefined_palette(void)
generate_halftone27_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 == WICBitmapPaletteTypeFixedHalftone125)
+ generate_halftone125_palette(td[i].color, td[i].count);
else if (td[i].type == WICBitmapPaletteTypeFixedHalftone256)
generate_halftone256_palette(td[i].color, td[i].count);
More information about the wine-cvs
mailing list