[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30808] trunk/blender/source/blender/imbuf /intern/jpeg.c: Fix #22875: image browser crashes on true colour jpg.

[Brecht Van Lommel]

Revision: 30808
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30808
Author:   blendix
Date:     2010-07-27 16:40:48 +0200 (Tue, 27 Jul 2010)

Log Message:
-----------
Fix #22875: image browser crashes on true colour jpg. The skip_input_data
callback was not correct, modified now to based on jpeg_mem_src as included
with libjpeg.

Modified Paths:
--------------
    trunk/blender/source/blender/imbuf/intern/jpeg.c

Modified: trunk/blender/source/blender/imbuf/intern/jpeg.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/jpeg.c	2010-07-27 12:11:25 UTC (rev 30807)
+++ trunk/blender/source/blender/imbuf/intern/jpeg.c	2010-07-27 14:40:48 UTC (rev 30808)
@@ -156,7 +156,10 @@
 {
 	my_src_ptr src = (my_src_ptr) cinfo->src;
 
-	src->pub.next_input_byte = src->pub.next_input_byte + num_bytes;
+	if(num_bytes > 0) {
+		src->pub.next_input_byte = src->pub.next_input_byte + num_bytes;
+		src->pub.bytes_in_buffer = src->pub.bytes_in_buffer - num_bytes;
+	}
 }