(no commit message)

diff --git a/MagickCore/magick-baseconfig.h b/MagickCore/magick-baseconfig.h
index 15e79f671df5ae859b319841f164b57654fbb19a..9e42254479e66ace1c126c703844500107b022b3 100644 (file)
--- 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 ece40daa0fee9e71899bb847aeaa69bef61394ed..873508a7cc622cccdc314d20f67efb735d6e09bf 100644 (file)
--- 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 481d0413e68ca050106bf2db20c504784cff5dd4..74c2977ebb193fdf9f3ef8af40b0a5a9511935e0 100644 (file)
--- 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