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

gdiplus: Add support for reading png gAMA chunks.

oldstable
Vincent Povirk 2015-04-01 15:26:00 -05:00 committed by Alexandre Julliard
parent 131a7b03e8
commit 3c74e465bc
1 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
dlls/gdiplus/image.c
View File

@ -3436,6 +3436,29 @@ static PropertyItem* create_prop(PROPID propid, PROPVARIANT* value)
return item;
}
static ULONG get_ulong_by_index(IWICMetadataReader* reader, ULONG index)
{
PROPVARIANT value;
HRESULT hr;
ULONG result=0;
hr = IWICMetadataReader_GetValueByIndex(reader, index, NULL, NULL, &value);
if (SUCCEEDED(hr))
{
switch (value.vt)
{
case VT_UI4:
result = value.u.ulVal;
break;
default:
ERR("unhandled case %u\n", value.vt);
break;
}
PropVariantClear(&value);
}
return result;
}
static void png_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UINT active_frame)
{
HRESULT hr;
@ -3456,6 +3479,7 @@ static void png_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI
{ "Source", PropertyTagEquipModel },
{ "Comment", PropertyTagExifUserComment },
};
BOOL seen_gamma=FALSE;
hr = IWICBitmapDecoder_GetFrame(decoder, active_frame, &frame);
if (hr != S_OK) return;
@ -3502,6 +3526,28 @@ static void png_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI
PropVariantClear(&value);
}
}
else if (SUCCEEDED(hr) && IsEqualGUID(&GUID_MetadataFormatChunkgAMA, &format))
{
PropertyItem* item;
if (!seen_gamma)
{
item = GdipAlloc(sizeof(PropertyItem) + sizeof(ULONG) * 2);
if (item)
{
ULONG *rational;
item->length = sizeof(ULONG) * 2;
item->type = PropertyTagTypeRational;
item->id = PropertyTagGamma;
rational = item->value = item + 1;
rational[0] = 100000;
rational[1] = get_ulong_by_index(reader, 0);
add_property(bitmap, item);
seen_gamma = TRUE;
GdipFree(item);
}
}
}
IWICMetadataReader_Release(reader);
}