(no commit message)

[imagemagick] / coders / jpeg.c

diff --git a/coders/jpeg.c b/coders/jpeg.c
index 6af6d2af9f6f3baeccf099f9c1835c34641fe970..0ba7077b3f45dda96a7c503d891b97ca1014d156 100644 (file)
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -520,10 +520,7 @@ static boolean ReadIPTCProfile(j_decompress_ptr jpeg_info)
     }
   else
     {
-      if (strcmp((char *) GetStringInfoDatum(profile),"8BIM") != 0)
-        status=SetImageProfile(image,"iptc",profile);
-      else
-        status=SetImageProfile(image,"8BIM",profile);
+      status=SetImageProfile(image,"8bim",profile);
       profile=DestroyStringInfo(profile);
       if (status == MagickFalse)
         ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
@@ -921,6 +918,7 @@ static Image *ReadJPEGImage(const ImageInfo *image_info,
   assert(exception != (ExceptionInfo *) NULL);
   assert(exception->signature == MagickSignature);
   debug=IsEventLogging();
+  (void) debug;
   image=AcquireImage(image_info);
   status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
   if (status == MagickFalse)
@@ -1716,7 +1714,6 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
   jpeg_info.client_data=(void *) image;
   jpeg_info.err=jpeg_std_error(&jpeg_error);
   jpeg_info.err->emit_message=(void (*)(j_common_ptr,int)) EmitMessage;
-  jpeg_info.err->error_exit=(void (*)(j_common_ptr)) JPEGErrorHandler;
   error_manager.image=image;
   jpeg_pixels=(JSAMPLE *) NULL;
   if (setjmp(error_manager.error_recovery) != 0)