Attachment #403346 for bug #520894

View | Details | Raw Unified | Return to bug 520894
Collapse All | Expand All

Lines 99-105 int dt_imageio_jpeg_decompress_header(const void *in, size_t length, dt_imageio_ Link Here

(-)src/common/imageio_jpeg.c (-2 / +2 lines)
99		99
100	jpg->dinfo.src = &(jpg->src);	100	jpg->dinfo.src = &(jpg->src);
101	// jpg->dinfo.buffered_image = TRUE;	101	// jpg->dinfo.buffered_image = TRUE;
102	jpeg_read_header(&(jpg->dinfo), TRUE);	102	jpeg_read_header(&(jpg->dinfo), (boolean)TRUE);
103	jpg->width = jpg->dinfo.image_width;	103	jpg->width = jpg->dinfo.image_width;
104	jpg->height = jpg->dinfo.image_height;	104	jpg->height = jpg->dinfo.image_height;
105	return 0;	105	return 0;
Lines 483-489 int dt_imageio_jpeg_read_header(const char filename, dt_imageio_jpeg_t jpg) Link Here
483	jpeg_stdio_src(&(jpg->dinfo), jpg->f);	483	jpeg_stdio_src(&(jpg->dinfo), jpg->f);
484	setup_read_icc_profile(&(jpg->dinfo));	484	setup_read_icc_profile(&(jpg->dinfo));
485	// jpg->dinfo.buffered_image = TRUE;	485	// jpg->dinfo.buffered_image = TRUE;
486	jpeg_read_header(&(jpg->dinfo), TRUE);	486	jpeg_read_header(&(jpg->dinfo), (boolean)TRUE);
487	jpg->width = jpg->dinfo.image_width;	487	jpg->width = jpg->dinfo.image_width;
488	jpg->height = jpg->dinfo.image_height;	488	jpg->height = jpg->dinfo.image_height;
489	return 0;	489	return 0;

Lines 177-183 void DngDecoderSlices::decodeSlice(DngDecoderThread* t) { Link Here

(-)src/external/rawspeed/RawSpeed/DngDecoderSlices.cpp (-1 / +1 lines)
177	CHECKSIZE(e.byteOffset+e.byteCount);	177	CHECKSIZE(e.byteOffset+e.byteCount);
178	JPEG_MEMSRC(&dinfo, (unsigned char*)mFile->getData(e.byteOffset), e.byteCount);	178	JPEG_MEMSRC(&dinfo, (unsigned char*)mFile->getData(e.byteOffset), e.byteCount);
179		179
180	if (JPEG_HEADER_OK != jpeg_read_header(&dinfo, TRUE))	180	if (JPEG_HEADER_OK != jpeg_read_header(&dinfo, (boolean)TRUE))
181	ThrowRDE("DngDecoderSlices: Unable to read JPEG header");	181	ThrowRDE("DngDecoderSlices: Unable to read JPEG header");
182		182
183	jpeg_start_decompress(&dinfo);	183	jpeg_start_decompress(&dinfo);

Lines 416-422 int read_header(const char filename, dt_imageio_jpeg_t jpg) Link Here

(-)src/imageio/format/jpeg.c (-1 / +1 lines)
416	jpeg_create_decompress(&(jpg->dinfo));	416	jpeg_create_decompress(&(jpg->dinfo));
417	jpeg_stdio_src(&(jpg->dinfo), jpg->f);	417	jpeg_stdio_src(&(jpg->dinfo), jpg->f);
418	// jpg->dinfo.buffered_image = TRUE;	418	// jpg->dinfo.buffered_image = TRUE;
419	jpeg_read_header(&(jpg->dinfo), TRUE);	419	jpeg_read_header(&(jpg->dinfo), (boolean)TRUE);
420	jpg->width = jpg->dinfo.image_width;	420	jpg->width = jpg->dinfo.image_width;
421	jpg->height = jpg->dinfo.image_height;	421	jpg->height = jpg->dinfo.image_height;
422	return 0;	422	return 0;

Return to bug 520894