gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-22 13:10:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Support greyscape output colorspace in JPEG decompression, fix Alpha output do NO, since JPEGs do not support it.

Browse source
This commit is contained in:
Riccardo Mottola 2020-11-03 01:57:34 +01:00
parent 36772d25a1
commit 7b819af623
2 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2020-11-03 Riccardo Mottola <rm@gnu.org>
* Source/NSBitmapImageRep+JPEG.m (_JPEGRepresentationWithProperties:):
Support greyscape output colorspace in JPEG decompression, fix Alpha output do NO, since JPEGs do not support it.
2020-10-18 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSTableView.m (-validateEditing): Reset _isValidating on

19
Source/NSBitmapImageRep+JPEG.m
View file

@ -413,6 +413,7 @@ static void gs_jpeg_memory_dest_destroy (j_compress_ptr cinfo)
unsigned char *imgbuffer = NULL;
BOOL isProgressive;
double x_density, y_density;
NSString *outColorSpace;
if (!(self = [super init]))
return nil;
@ -450,9 +451,17 @@ static void gs_jpeg_memory_dest_destroy (j_compress_ptr cinfo)
jpeg_read_header(&cinfo, TRUE);
/* we use RGB as target color space; others are not yet supported */
cinfo.out_color_space = JCS_RGB;
if (cinfo.jpeg_color_space == JCS_GRAYSCALE)
{
cinfo.out_color_space = JCS_GRAYSCALE;
outColorSpace = NSCalibratedWhiteColorSpace;
}
else
{
/* In all other cases we use RGB as target color space; others are not yet supported */
cinfo.out_color_space = JCS_RGB;
outColorSpace = NSCalibratedRGBColorSpace;
}
/* decompress */
jpeg_start_decompress(&cinfo);
@ -517,9 +526,9 @@ static void gs_jpeg_memory_dest_destroy (j_compress_ptr cinfo)
pixelsHigh: cinfo.output_height
bitsPerSample: BITS_IN_JSAMPLE
samplesPerPixel: cinfo.output_components
hasAlpha: (cinfo.output_components == 3 ? NO : YES)
hasAlpha: NO // JPEG has no Alpha support
isPlanar: NO
colorSpaceName: NSCalibratedRGBColorSpace
colorSpaceName: outColorSpace
bytesPerRow: rowSize
bitsPerPixel: BITS_IN_JSAMPLE * cinfo.output_components];