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

windowscodecs: Make JPEG decoder fallback to 96 dpi resolution for density_unit == 0 case.

This commit is contained in:
Dmitry Timoshkov 2013-03-18 14:22:13 +09:00 committed by Alexandre Julliard
parent 6ee486644a
commit fb87ee2464
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/windowscodecs/jpegformat.c
View File

@ -548,16 +548,23 @@ static HRESULT WINAPI JpegDecoder_Frame_GetResolution(IWICBitmapFrameDecode *ifa
EnterCriticalSection(&This->lock); EnterCriticalSection(&This->lock);
if (This->cinfo.density_unit == 2) /* pixels per centimeter */ switch (This->cinfo.density_unit)
{ {
case 2: /* pixels per centimeter */
*pDpiX = This->cinfo.X_density * 2.54; *pDpiX = This->cinfo.X_density * 2.54;
*pDpiY = This->cinfo.Y_density * 2.54; *pDpiY = This->cinfo.Y_density * 2.54;
} break;
else
{ case 1: /* pixels per inch */
/* 1 = pixels per inch, 0 = unknown */
*pDpiX = This->cinfo.X_density; *pDpiX = This->cinfo.X_density;
*pDpiY = This->cinfo.Y_density; *pDpiY = This->cinfo.Y_density;
break;
case 0: /* unknown */
default:
*pDpiX = 96.0;
*pDpiY = 96.0;
break;
} }
LeaveCriticalSection(&This->lock); LeaveCriticalSection(&This->lock);