From: cristy <urban-warrior@git.imagemagick.org>
Date: Wed, 1 Jan 2014 19:46:42 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~3011
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6e89dc853936c9995325ee480afebfcbc1639d5b;p=imagemagick

---

diff --git a/MagickCore/magick-baseconfig.h b/MagickCore/magick-baseconfig.h
index 15e79f671..9e4225447 100644
--- a/MagickCore/magick-baseconfig.h
+++ b/MagickCore/magick-baseconfig.h
@@ -1117,6 +1117,9 @@
 #define MAGICKCORE_LCMS_DELEGATE 1
 #endif
 
+/* Define if you have OPENJP2 library */
+/* #undef LIBOPENJP2_DELEGATE */
+
 /* Directory where architecture-dependent files live. */
 #ifndef MAGICKCORE_LIBRARY_PATH
 #define MAGICKCORE_LIBRARY_PATH "/usr/lib64/ImageMagick-7.0.0/"
diff --git a/MagickCore/quantize.c b/MagickCore/quantize.c
index ece40daa0..873508a7c 100644
--- a/MagickCore/quantize.c
+++ b/MagickCore/quantize.c
@@ -759,8 +759,6 @@ static inline void SetAssociatedAlpha(const Image *image,CubeInfo *cube_info)
 
   associate_alpha=image->alpha_trait == BlendPixelTrait ? MagickTrue :
     MagickFalse;
-  if (cube_info->quantize_info->colorspace == TransparentColorspace)
-    associate_alpha=MagickFalse;
   if ((cube_info->quantize_info->number_colors == 2) &&
       (cube_info->quantize_info->colorspace == GRAYColorspace))
     associate_alpha=MagickFalse;
diff --git a/MagickCore/version.h b/MagickCore/version.h
index 481d0413e..74c2977eb 100644
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2014 ImageMagick Studio LLC"
-#define MagickSVNRevision  "14085:14090M"
+#define MagickSVNRevision  "14085:14096M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  1,0,0