From: Pavel Charvat <pavel.charvat@netcentrum.cz>
Date: Wed, 27 Sep 2006 11:24:47 +0000 (+0200)
Subject: and now a correct solution... skip_input_data should be able to jump
X-Git-Tag: holmes-import~521
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=a56177e3cf4200e8d784658fbf2c9cb8837aef0c;p=libucw.git

and now a correct solution... skip_input_data should be able to jump
exactly at EOF (according to libjpeg documentation)
---

diff --git a/images/io-libjpeg.c b/images/io-libjpeg.c
index ccc20f36..00d1419d 100644
--- a/images/io-libjpeg.c
+++ b/images/io-libjpeg.c
@@ -135,12 +135,12 @@ libjpeg_skip_input_data(j_decompress_ptr cinfo, long num_bytes)
         {
 	  num_bytes -= i->src.bytes_in_buffer;
 	  libjpeg_fastbuf_read_commit(i);
-	  bskip(i->fastbuf, num_bytes);
-	  if (!libjpeg_fastbuf_read_prepare(i))
+	  if (bskip(i->fastbuf, num_bytes) < num_bytes)
 	    {
 	      IMAGE_ERROR(i->err.io->context, IMAGE_ERROR_READ_FAILED, "Incomplete JPEG file");
 	      longjmp(i->err.setjmp_buf, 1);
 	    }
+	  libjpeg_fastbuf_read_prepare(i);
 	}
     }
 }