(no commit message)

diff --git a/coders/jpeg.c b/coders/jpeg.c
index ce499c86ffbd8c5db6a558285f63b8cce77b8c99..42c80e4ed1ade5b2a69ddd353ee9c7100c7017b5 100644 (file)
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -297,10 +297,10 @@ static MagickBooleanType JPEGErrorHandler(j_common_ptr jpeg_info)
       "[%s] JPEG Trace: \"%s\"",image->filename,message);
   if (error_manager->finished != MagickFalse)
     (void) ThrowMagickException(&image->exception,GetMagickModule(),
-      CorruptImageWarning,(char *) message,image->filename);
+      CorruptImageWarning,(char *) message,"`%s'",image->filename);
   else
     (void) ThrowMagickException(&image->exception,GetMagickModule(),
-      CorruptImageError,(char *) message,image->filename);
+      CorruptImageError,(char *) message,"`%s'",image->filename);
   longjmp(error_manager->error_recovery,1);
 }
 

diff --git a/coders/png.c b/coders/png.c
index 9d1ce78e91161c874908fd8b832f1c942c4373c7..bd0e8d37a19eb99785b0ff9a44b456323fd2ff50 100644 (file)
--- a/coders/png.c
+++ b/coders/png.c
@@ -7648,7 +7648,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
                    {
                       (void) LogMagickEvent(CoderEvent,GetMagickModule(),
                           "    It is the HP-Microsoft sRGB)");
-                      if (image->rendering_intent==UndefinedIntent);
+                      if (image->rendering_intent==UndefinedIntent)
                         image->rendering_intent=PerceptualIntent;
                    }
                    else
@@ -7669,7 +7669,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
                    {
                       (void) LogMagickEvent(CoderEvent,GetMagickModule(),
                           "    It is the ICC no-black sRGB)");
-                      if (image->rendering_intent==UndefinedIntent);
+                      if (image->rendering_intent==UndefinedIntent)
                         image->rendering_intent=PerceptualIntent;
                    }
                    else
@@ -7722,7 +7722,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
            if (logging != MagickFalse)
               (void) LogMagickEvent(CoderEvent,GetMagickModule(),
               "    Freeing bogus colormap");
-           (void *) RelinquishMagickMemory(image->colormap);
+           (void) RelinquishMagickMemory(image->colormap);
            image->colormap=NULL;
         }
     }