X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=images%2Fio-libjpeg.c;h=16f10b7a46ef3f39853089d948e0b9646bbb9bd9;hb=ec69802864ba3b2a3b22f12f29bb8fe867dd1a22;hp=62d91202fe574e1f76d16176926e3f0eebb26176;hpb=69020f90ffa01204198d957af64acd192d20ed1e;p=libucw.git

diff --git a/images/io-libjpeg.c b/images/io-libjpeg.c
index 62d91202..16f10b7a 100644
--- a/images/io-libjpeg.c
+++ b/images/io-libjpeg.c
@@ -9,9 +9,9 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
-#include "lib/mempool.h"
-#include "lib/fastbuf.h"
+#include "ucw/lib.h"
+#include "ucw/mempool.h"
+#include "ucw/fastbuf.h"
 #include "images/images.h"
 #include "images/error.h"
 #include "images/color.h"
@@ -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;
 }