marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

windowscodecs: Add support for 12bps RGB format to TIFF decoder. 

Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
Signed-off-by: Vincent Povirk <vincent@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
feature/deterministic
Dmitry Timoshkov 2020-04-21 12:02:12 +08:00 committed by Alexandre Julliard
parent a1fb3bb4da
commit d5830ff9bd
1 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
dlls/windowscodecs/tiffformat.c
View File

@ -428,6 +428,7 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info)
switch(bps)
{
case 1:
case 4:
case 8:
decode_info->reverse_bgr = 1;
if (samples == 3)
@ -1111,6 +1112,41 @@ static HRESULT TiffFrameDecode_ReadTile(TiffFrameDecode *This, UINT tile_x, UINT
HeapFree(GetProcessHeap(), 0, srcdata);
}
/* 12bps RGB */
else if (This->decode_info.source_bpp == 12 && This->decode_info.samples == 3 && This->decode_info.bpp == 24)
{
BYTE *srcdata, *src, *dst;
DWORD x, y, count, width_bytes = (This->decode_info.tile_width * 12 + 7) / 8;
count = width_bytes * This->decode_info.tile_height;
srcdata = HeapAlloc(GetProcessHeap(), 0, count);
if (!srcdata) return E_OUTOFMEMORY;
memcpy(srcdata, This->cached_tile, count);
for (y = 0; y < This->decode_info.tile_height; y++)
{
src = srcdata + y * width_bytes;
dst = This->cached_tile + y * This->decode_info.tile_width * 3;
for (x = 0; x < This->decode_info.tile_width; x += 2)
{
dst[0] = ((src[1] & 0xf0) >> 4) * 17; /* B */
dst[1] = (src[0] & 0x0f) * 17; /* G */
dst[2] = ((src[0] & 0xf0) >> 4) * 17; /* R */
if (x + 1 < This->decode_info.tile_width)
{
dst[5] = (src[1] & 0x0f) * 17; /* B */
dst[4] = ((src[2] & 0xf0) >> 4) * 17; /* G */
dst[3] = (src[2] & 0x0f) * 17; /* R */
}
src += 3;
dst += 6;
}
}
HeapFree(GetProcessHeap(), 0, srcdata);
}
/* 8bpp grayscale with extra alpha */
else if (This->decode_info.source_bpp == 16 && This->decode_info.samples == 2 && This->decode_info.bpp == 32)
{