(no commit message)

diff --git a/MagickCore/property.c b/MagickCore/property.c
index 415ea62ac219eba424a0abfff3e11f391f186b1e..5d1dc77f6bcc751df6fee69d66c63d495b8bc89b 100644 (file)
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -1580,8 +1580,7 @@ static MagickBooleanType GetXMPProperty(const Image *image,const char *property)
 }
 
 static char *TracePSClippath(const unsigned char *blob,size_t length,
-  const size_t magick_unused(columns),
-  const size_t magick_unused(rows))
+  const size_t magick_unused(columns),const size_t magick_unused(rows))
 {
   char
     *path,

diff --git a/coders/caption.c b/coders/caption.c
index 9bf12a043d6c90d2bcaa4bb9fce0f2b97dfdc852..320b559fed108bfb0bc22ed8c32cd488bfcf8181 100644 (file)
--- a/coders/caption.c
+++ b/coders/caption.c
@@ -358,14 +358,15 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info,
     for (x=page.x; x < (ssize_t) (image->columns-page.x); x++)
     {
       MagickRealType
-        fill_opacity;
+        fill_alpha;
 
       (void) GetFillColor(draw_info,x,y,&fill_color,exception);
-      fill_opacity=(*p)*fill_color.alpha/canvas->num_grays;
+      fill_alpha=(MagickRealType) (*p)/(canvas->num_grays-1);
       if (draw_info->text_antialias == MagickFalse)
-        fill_opacity=fill_opacity >= 0.5 ? 1.0 : 0.0;
-      CompositePixelOver(image,&fill_color,fill_opacity,q,
-        GetPixelAlpha(image,q),q);
+        fill_alpha=fill_alpha >= 0.5 ? 1.0 : 0.0;
+      fill_alpha=fill_alpha*fill_color.alpha;
+      CompositePixelOver(image,&fill_color,fill_alpha,q,GetPixelAlpha(image,q),
+        q);
       p++;
       q+=GetPixelChannels(image);
     }