more MJ's corrections... to be continue

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

diff --git a/images/io-libjpeg.c b/images/io-libjpeg.c
index 10c49d7d91d1b256eb7683de3cac9d5cb7f47600..1d3d37c5029e046212bee97f484179b50bea9391 100644 (file)
--- a/images/io-libjpeg.c
+++ b/images/io-libjpeg.c
@@ -13,7 +13,10 @@
 #include "lib/mempool.h"
 #include "lib/fastbuf.h"
 #include "images/images.h"
+#include "images/error.h"
+#include "images/color.h"
 #include "images/io-main.h"
+
 #include <stdio.h>
 #include <sys/types.h>
 #include <jpeglib.h>
@@ -49,7 +52,7 @@ libjpeg_read_error_exit(j_common_ptr cinfo)
   struct libjpeg_err *e = (struct libjpeg_err *)cinfo->err;
   byte buf[JMSG_LENGTH_MAX];
   e->pub.format_message(cinfo, buf);
-  image_thread_err_dup(e->io->thread, IMAGE_ERR_READ_FAILED, buf);
+  IMAGE_ERROR(e->io->context, IMAGE_ERROR_READ_FAILED, "%s", buf);
   longjmp(e->setjmp_buf, 1);
 }
 
@@ -60,7 +63,7 @@ libjpeg_write_error_exit(j_common_ptr cinfo)
   struct libjpeg_err *e = (struct libjpeg_err *)cinfo->err;
   byte buf[JMSG_LENGTH_MAX];
   e->pub.format_message(cinfo, buf);
-  image_thread_err_dup(e->io->thread, IMAGE_ERR_WRITE_FAILED,  buf);
+  IMAGE_ERROR(e->io->context, IMAGE_ERROR_WRITE_FAILED, "%s", buf);
   longjmp(e->setjmp_buf, 1);
 }
 
@@ -132,7 +135,11 @@ 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 (!bskip(i->fastbuf, 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);
        }
     }
@@ -148,7 +155,7 @@ libjpeg_fastbuf_write_prepare(struct libjpeg_write_internals *i)
   i->dest.free_in_buffer = len;
   if (!len)
     {
-      image_thread_err(i->err.io->thread, IMAGE_ERR_WRITE_FAILED, "Unexpected end of stream");
+      IMAGE_ERROR(i->err.io->context, IMAGE_ERROR_WRITE_FAILED, "Unexpected end of stream");
       longjmp(i->err.setjmp_buf, 1);
     }
 }
@@ -178,8 +185,6 @@ libjpeg_empty_output_buffer(j_compress_ptr cinfo)
   return TRUE;
 }
 
-#ifdef CONFIG_IMAGES_EXIF
-
 static inline uns
 libjpeg_read_byte(struct libjpeg_read_internals *i)
 {
@@ -216,7 +221,8 @@ libjpeg_app1_preprocessor(j_decompress_ptr cinfo)
 {
   struct libjpeg_read_internals *i = (struct libjpeg_read_internals *)cinfo;
   struct image_io *io = i->err.io;
-  uns len = (libjpeg_read_byte(i) << 8) + libjpeg_read_byte(i);
+  uns len = libjpeg_read_byte(i) << 8;
+  len += libjpeg_read_byte(i);
   DBG("Found APP1 marker, len=%u", len);
   if (len < 2)
     return TRUE;
@@ -241,8 +247,6 @@ libjpeg_app1_preprocessor(j_decompress_ptr cinfo)
   return TRUE;
 }
 
-#endif
-
 static void
 libjpeg_read_cancel(struct image_io *io)
 {
@@ -280,10 +284,8 @@ libjpeg_read_header(struct image_io *io)
   i->src.resync_to_restart = jpeg_resync_to_restart;
   i->src.term_source = libjpeg_term_source;
 
-#ifdef CONFIG_IMAGES_EXIF
   if (io->flags & IMAGE_IO_WANT_EXIF)
     jpeg_set_marker_processor(&i->cinfo, JPEG_APP0 + 1, libjpeg_app1_preprocessor);
-#endif
 
   /* Read JPEG header and setup decompression options */
   DBG("Reading image header");
@@ -324,7 +326,7 @@ libjpeg_read_data(struct image_io *io)
        break;
       default:
        jpeg_destroy_decompress(&i->cinfo);
-       image_thread_err(io->thread, IMAGE_ERR_INVALID_PIXEL_FORMAT, "Unsupported color space.");
+       IMAGE_ERROR(io->context, IMAGE_ERROR_INVALID_PIXEL_FORMAT, "Unsupported color space.");
        return 0;
     }
 
@@ -466,13 +468,12 @@ libjpeg_write(struct image_io *io)
        break;
       default:
        jpeg_destroy_compress(&i.cinfo);
-       image_thread_err(io->thread, IMAGE_ERR_INVALID_PIXEL_FORMAT, "Unsupported pixel format.");
+       IMAGE_ERROR(io->context, IMAGE_ERROR_INVALID_PIXEL_FORMAT, "Unsupported pixel format.");
        return 0;
     }
   jpeg_set_defaults(&i.cinfo);
   if (io->jpeg_quality)
     jpeg_set_quality(&i.cinfo, MIN(io->jpeg_quality, 100), 1);
-#ifdef CONFIG_IMAGES_EXIF
   if (io->exif_size)
     {
       /* According to the Exif specification, the Exif APP1 marker has to follow immediately after the SOI,
@@ -481,17 +482,14 @@ libjpeg_write(struct image_io *io)
       i.cinfo.write_JFIF_header = FALSE;
       i.cinfo.write_Adobe_marker = FALSE;
     }
-#endif
 
   /* Compress the image */
   jpeg_start_compress(&i.cinfo, TRUE);
-#ifdef CONFIG_IMAGES_EXIF
   if (io->exif_size)
     {
       DBG("Writing EXIF");
       jpeg_write_marker(&i.cinfo, JPEG_APP0 + 1, io->exif_data, io->exif_size);
     }
-#endif
   switch (img->pixel_size)
     {
       /* grayscale or RGB */