wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 396031 - with color management on, ycck/cymk jpeg images crash. r=alfredkayser, sr+a=pavlov

Browse Source
This commit is contained in:
tor@cs.brown.edu 2007-09-24 14:42:39 -07:00
parent 360fe7681a
commit fd9604d9fc
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp
View File

@ -309,8 +309,8 @@ NS_IMETHODIMP nsJPEGDecoder::WriteFrom(nsIInputStream *inStr, PRUint32 count, PR
CHANNELS_SH(channels) |
BYTES_SH(1);
/* Adobe Photoshop writes CMYK files with inverted data */
if (mInfo.jpeg_color_space == JCS_CMYK)
/* Adobe Photoshop writes YCCK/CMYK files with inverted data */
if (mInfo.out_color_space == JCS_CMYK)
type |= FLAVOR_SH(mInfo.saw_Adobe_marker ? 1 : 0);
if (gfxPlatform::GetCMSOutputProfile())
@ -569,7 +569,8 @@ nsJPEGDecoder::OutputScanlines()
/* Use the Cairo image buffer as scanline buffer */
JSAMPROW sampleRow = (JSAMPROW)imageRow;
if (!mTransform || mInfo.out_color_space != JCS_GRAYSCALE) {
if (!mTransform || (mInfo.out_color_space != JCS_GRAYSCALE &&
mInfo.out_color_space != JCS_CMYK)) {
/* Put the pixels at end of row to enable in-place expansion */
sampleRow += mInfo.output_width;
}
@ -587,6 +588,13 @@ nsJPEGDecoder::OutputScanlines()
sampleRow += mInfo.output_width;
}
cmsDoTransform(mTransform, source, sampleRow, mInfo.output_width);
/* Move 3byte RGB data to end of row */
if (mInfo.out_color_space == JCS_CMYK) {
memmove(sampleRow + mInfo.output_width,
sampleRow,
3 * mInfo.output_width);
sampleRow += mInfo.output_width;
}
} else if (gfxPlatform::IsCMSEnabled()) {
/* No embedded ICC profile - treat as sRGB */
cmsHTRANSFORM transform = gfxPlatform::GetCMSRGBTransform();