update FT2 Changes

[imager.git] / JPEG / imjpeg.c

diff --git a/JPEG/imjpeg.c b/JPEG/imjpeg.c
index c9787bd5ba51cead5df37cf16caebbfc4258b7bb..84d245037d1a31286130378245e6cfdb840c1e4f 100644 (file)
--- a/JPEG/imjpeg.c
+++ b/JPEG/imjpeg.c
@@ -34,7 +34,6 @@ Reads and writes JPEG images
 #include "jerror.h"
 #include <errno.h>
 #include <stdlib.h>
-#include "imexif.h"
 
 #define JPEG_APP13       0xED    /* APP13 marker code */
 #define JPEG_APP1 (JPEG_APP0 + 1)
@@ -42,6 +41,9 @@ Reads and writes JPEG images
 
 #define JPEG_DIM_MAX JPEG_MAX_DIMENSION
 
+#define _STRINGIFY(x) #x
+#define STRINGIFY(x) _STRINGIFY(x)
+
 static unsigned char fake_eoi[]={(JOCTET) 0xFF,(JOCTET) JPEG_EOI};
 
 /* Source and Destination managers */
@@ -215,7 +217,7 @@ wiol_empty_output_buffer(j_compress_ptr cinfo) {
 
   if (rc != JPGS) { /* XXX: Should raise some jpeg error */
     myfree(dest->buffer);
-    mm_log((1, "wiol_empty_output_buffer: Error: nbytes = %d != rc = %d\n", JPGS, rc));
+    mm_log((1, "wiol_empty_output_buffer: Error: nbytes = %d != rc = %d\n", JPGS, (int)rc));
     ERREXIT(cinfo, JERR_FILE_WRITE);
   }
   dest->pub.free_in_buffer = JPGS;
@@ -235,7 +237,7 @@ wiol_term_destination (j_compress_ptr cinfo) {
     ERREXIT(cinfo, JERR_FILE_WRITE);
   }
 
-  if (dest != NULL) myfree(dest->buffer);
+  myfree(dest->buffer);
 }
 
 
@@ -337,6 +339,25 @@ transfer_gray(i_color *out, JSAMPARRAY in, int width) {
 
 typedef void (*transfer_function_t)(i_color *out, JSAMPARRAY in, int width);
 
+static const char version_string[] =
+#ifdef LIBJPEG_TURBO_VERSION
+  "libjpeg-turbo " STRINGIFY(LIBJPEG_TURBO_VERSION) " api " STRINGIFY(JPEG_LIB_VERSION)
+#else
+  "libjpeg " STRINGIFY(JPEG_LIB_VERSION)
+#endif
+  ;
+
+/*
+=item i_libjpeg_version()
+
+=cut
+*/
+
+const char *
+i_libjpeg_version(void) {
+  return version_string;
+}
+
 /*
 =item i_readjpeg_wiol(data, length, iptc_itext, itlength)
 
@@ -473,7 +494,11 @@ i_readjpeg_wiol(io_glue *data, int length, char** iptc_itext, int *itlength) {
                 markerp->data_length);
     }
     else if (markerp->marker == JPEG_APP1 && !seen_exif) {
-      seen_exif = i_int_decode_exif(im, markerp->data, markerp->data_length);
+      unsigned char *data = markerp->data;
+      size_t len = markerp->data_length;
+      if (len >= 6 && memcmp(data, "Exif\0\0", 6) == 0) {
+       seen_exif = im_decode_exif(im, data+6, len-6);
+      }
     }
     else if (markerp->marker == JPEG_APP13) {
       *iptc_itext = mymalloc(markerp->data_length);
@@ -525,7 +550,7 @@ i_readjpeg_wiol(io_glue *data, int length, char** iptc_itext, int *itlength) {
 
   i_tags_set(&im->tags, "i_format", "jpeg", 4);
 
-  mm_log((1,"i_readjpeg_wiol -> (0x%x)\n",im));
+  mm_log((1,"i_readjpeg_wiol -> (%p)\n",im));
   return im;
 }
 
@@ -544,6 +569,7 @@ i_writejpeg_wiol(i_img *im, io_glue *ig, int qfactor) {
   int comment_entry;
   int want_channels = im->channels;
   int progressive = 0;
+  int optimize = 0;
 
   struct jpeg_compress_struct cinfo;
   struct my_error_mgr jerr;
@@ -605,6 +631,9 @@ i_writejpeg_wiol(i_img *im, io_glue *ig, int qfactor) {
   if (progressive) {
     jpeg_simple_progression(&cinfo);
   }
+  if (!i_tags_get_int(&im->tags, "jpeg_optimize", 0, &optimize))
+    optimize = 0;
+  cinfo.optimize_coding = optimize;
 
   got_xres = i_tags_get_float(&im->tags, "i_xres", 0, &xres);
   got_yres = i_tags_get_float(&im->tags, "i_yres", 0, &yres);