[gentoo-commits] gentoo-x86 commit in media-video/cinelerra/files: cinelerra-jpeg-7.patch

[Samuli Suominen (ssuominen)]

ssuominen    10/01/30 14:37:16

  Added:                cinelerra-jpeg-7.patch
  Log:
  Fix crash with jpeg >= 7 wrt #292575 by Salah Coronya.
  (Portage version: 2.2_rc61/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  media-video/cinelerra/files/cinelerra-jpeg-7.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/cinelerra/files/cinelerra-jpeg-7.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/cinelerra/files/cinelerra-jpeg-7.patch?rev=1.1&content-type=text/plain

Index: cinelerra-jpeg-7.patch
===================================================================
diff -r -u cinelerra-20090210/quicktime/libmjpeg.c cinelerra-20090210-r1/quicktime/libmjpeg.c
--- cinelerra-20090210/quicktime/libmjpeg.c	2009-02-10 06:19:07.000000000 -0600
+++ cinelerra-20090210-r1/quicktime/libmjpeg.c	2010-01-23 01:37:31.000000000 -0600
@@ -653,6 +653,7 @@
 /* Ideally the error handler would be set here but it must be called in a thread */
 	jpeg_create_decompress(&(engine->jpeg_decompress));
 	engine->jpeg_decompress.raw_data_out = TRUE;
+	engine->jpeg_decompress.do_fancy_upsampling = FALSE;
 	engine->jpeg_decompress.dct_method = JDCT_IFAST;
 }
 
@@ -737,6 +738,7 @@
 				engine->jpeg_decompress.dc_huff_tbl_ptrs );
 // Reset by jpeg_read_header
 	engine->jpeg_decompress.raw_data_out = TRUE;
+	engine->jpeg_decompress.do_fancy_upsampling = FALSE;
 	jpeg_start_decompress(&engine->jpeg_decompress);
 
 // Generate colormodel from jpeg sampling
@@ -801,6 +803,7 @@
 
 
 	engine->jpeg_compress.raw_data_in = TRUE;
+	engine->jpeg_compress.do_fancy_downsampling = FALSE;
 	jpeg_start_compress(&engine->jpeg_compress, TRUE);
 
 	while(engine->jpeg_compress.next_scanline < engine->jpeg_compress.image_height)