Merge with git+ssh://git.ucw.cz/projects/sherlock/GIT/sherlock.git

[libucw.git] / images / io-libjpeg.c

diff --git a/images/io-libjpeg.c b/images/io-libjpeg.c
index 62d91202fe574e1f76d16176926e3f0eebb26176..be394c95b393a9152fe300c60bd1adbdc9391e30 100644 (file)
--- a/images/io-libjpeg.c
+++ b/images/io-libjpeg.c
@@ -94,9 +94,10 @@ libjpeg_fastbuf_read_prepare(struct libjpeg_read_internals *i)
   DBG("libjpeg_fb_read_prepare()");
   byte *start;
   uns len = bdirect_read_prepare(i->fastbuf, &start);
+  DBG("readed %u bytes at %p", len, start);
   if (!len)
     {
-      // XXX: maybe only generate a warning and generate EOI margers to recover from such errors (also in skip_input_data)
+      // XXX: maybe only generate a warning and return EOI markers to recover from such errors (also in skip_input_data)
       IMAGE_ERROR(i->err.io->context, IMAGE_ERROR_READ_FAILED, "Incomplete JPEG file");
       longjmp(i->err.setjmp_buf, 1);
     }
@@ -133,6 +134,7 @@ libjpeg_fill_input_buffer(j_decompress_ptr cinfo)
   DBG("libjpeg_fill_input_buffer()");
   struct libjpeg_read_internals *i = (struct libjpeg_read_internals *)cinfo;
   libjpeg_fastbuf_read_commit(i);
+  libjpeg_fastbuf_read_prepare(i);
   return 1;
 }