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

gdiplus: Add support for reading png cHRM chunks. 

Signed-off-by: Vincent Povirk <vincent@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Vincent Povirk 2016-06-15 12:43:41 -05:00 committed by Alexandre Julliard
parent 2e16630a61
commit bf4a2ba264
1 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
dlls/gdiplus/image.c
View File

@ -3483,7 +3483,7 @@ static void png_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI
{ "Source", PropertyTagEquipModel },
{ "Comment", PropertyTagExifUserComment },
};
BOOL seen_gamma=FALSE;
BOOL seen_gamma=FALSE, seen_whitepoint=FALSE, seen_chrm=FALSE;
hr = IWICBitmapDecoder_GetFrame(decoder, active_frame, &frame);
if (hr != S_OK) return;
@ -3552,6 +3552,57 @@ static void png_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI
}
}
}
else if (SUCCEEDED(hr) && IsEqualGUID(&GUID_MetadataFormatChunkcHRM, &format))
{
PropertyItem* item;
if (!seen_whitepoint)
{
item = GdipAlloc(sizeof(PropertyItem) + sizeof(ULONG) * 4);
if (item)
{
ULONG *rational;
item->length = sizeof(ULONG) * 4;
item->type = PropertyTagTypeRational;
item->id = PropertyTagWhitePoint;
rational = item->value = item + 1;
rational[0] = get_ulong_by_index(reader, 0);
rational[1] = 100000;
rational[2] = get_ulong_by_index(reader, 1);
rational[3] = 100000;
add_property(bitmap, item);
seen_whitepoint = TRUE;
GdipFree(item);
}
}
if (!seen_chrm)
{
item = GdipAlloc(sizeof(PropertyItem) + sizeof(ULONG) * 12);
if (item)
{
ULONG *rational;
item->length = sizeof(ULONG) * 12;
item->type = PropertyTagTypeRational;
item->id = PropertyTagPrimaryChromaticities;
rational = item->value = item + 1;
rational[0] = get_ulong_by_index(reader, 2);
rational[1] = 100000;
rational[2] = get_ulong_by_index(reader, 3);
rational[3] = 100000;
rational[4] = get_ulong_by_index(reader, 4);
rational[5] = 100000;
rational[6] = get_ulong_by_index(reader, 5);
rational[7] = 100000;
rational[8] = get_ulong_by_index(reader, 6);
rational[9] = 100000;
rational[10] = get_ulong_by_index(reader, 7);
rational[11] = 100000;
add_property(bitmap, item);
seen_chrm = TRUE;
GdipFree(item);
}
}
}
IWICMetadataReader_Release(reader);
}