From 09250197c8c11c327786f9d6d2eb5a00b3359afd Mon Sep 17 00:00:00 2001 From: cristy Date: Tue, 7 Feb 2012 18:53:31 +0000 Subject: [PATCH] --- MagickCore/decorate.c | 5 +++-- MagickCore/paint.c | 4 +++- configure.ac | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/MagickCore/decorate.c b/MagickCore/decorate.c index bfacdf4cd..40c687b91 100644 --- a/MagickCore/decorate.c +++ b/MagickCore/decorate.c @@ -229,8 +229,9 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info, frame_image=DestroyImage(frame_image); return((Image *) NULL); } - if (frame_image->matte_color.alpha != OpaqueAlpha) - frame_image->matte=MagickTrue; + if ((frame_image->border_color.matte != MagickFalse) && + (frame_image->matte == MagickFalse)) + (void) SetImageAlpha(frame_image,OpaqueAlpha,exception); frame_image->page=image->page; if ((image->page.width != 0) && (image->page.height != 0)) { diff --git a/MagickCore/paint.c b/MagickCore/paint.c index 22e3ac57a..09fdcae8c 100644 --- a/MagickCore/paint.c +++ b/MagickCore/paint.c @@ -451,7 +451,7 @@ MagickExport MagickBooleanType GradientImage(Image *image, */ status=DrawGradientImage(image,draw_info,exception); draw_info=DestroyDrawInfo(draw_info); - if ((start_color->alpha == OpaqueAlpha) && (stop_color->alpha == OpaqueAlpha)) + if ((start_color->matte == MagickFalse) && (stop_color->matte == MagickFalse)) image->matte=MagickFalse; if ((IsPixelInfoGray(start_color) != MagickFalse) && (IsPixelInfoGray(stop_color) != MagickFalse)) @@ -770,6 +770,8 @@ MagickExport MagickBooleanType OpaquePaintImage(Image *image, (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); + if ((fill->matte != MagickFalse) && (image->matte == MagickFalse)) + (void) SetImageAlpha(image,OpaqueAlpha,exception); /* Make image color opaque. */ diff --git a/configure.ac b/configure.ac index b716bf42a..cca7ecd3d 100755 --- a/configure.ac +++ b/configure.ac @@ -125,7 +125,7 @@ AC_SUBST(PACKAGE_VERSION_ADDENDUM)dnl # Ensure that make can run correctly AM_SANITY_CHECK -AM_INIT_AUTOMAKE([1.11 color-tests foreign parallel-tests silent-rules subdir-objects dist-zip dist-bzip2 dist-lzip dist-xz]) +AM_INIT_AUTOMAKE([1.11 color-tests foreign parallel-tests silent-rules subdir-objects dist-bzip2 dist-lzip dist-xz dist-zip]) # Enable support for silent build rules m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) -- 2.40.0