From: Cristy <urban-warrior@imagemagick.org>
Date: Sun, 8 Nov 2015 20:49:24 +0000 (-0500)
Subject: Revert colormap patch, further analysis required
X-Git-Tag: 7.0.1-0~509
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=428ba7228ce880d2c779b404fe306ef2942347e7;p=imagemagick

Revert colormap patch, further analysis required
---

diff --git a/MagickCore/colormap.c b/MagickCore/colormap.c
index e7cf95d4b..e6152338d 100644
--- a/MagickCore/colormap.c
+++ b/MagickCore/colormap.c
@@ -114,7 +114,7 @@ MagickExport MagickBooleanType AcquireImageColormap(Image *image,
   assert(image->signature == MagickCoreSignature);
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
-  image->colors=MagickMax(colors,1);
+  image->colors=MagickMax(colors,2);
   if (image->colormap == (PixelInfo *) NULL)
     image->colormap=(PixelInfo *) AcquireQuantumMemory(image->colors,
       sizeof(*image->colormap));
diff --git a/configure.ac b/configure.ac
index 6a3348d63..dab962e89 100755
--- a/configure.ac
+++ b/configure.ac
@@ -3824,7 +3824,7 @@ matches your expectations.
   Host system type: $host
   Build system type: $build
 
-                  Option                        Value
+                 Option                        Value
   ------------------------------------------------------------------------------
   Shared libraries  --enable-shared=$enable_shared		$libtool_build_shared_libs
   Static libraries  --enable-static=$enable_static		$libtool_build_static_libs
@@ -3834,7 +3834,7 @@ matches your expectations.
   High Dynamic Range Imagery
                     --enable-hdri=$enable_hdri		$enable_hdri
 
-  Install documentation:    	$wantdocs
+  Install documentation:			$wantdocs
 
   Delegate Library Configuration:
   BZLIB             --with-bzlib=$with_bzlib		$have_bzlib
@@ -3850,12 +3850,12 @@ matches your expectations.
   JBIG              --with-jbig=$with_jbig		$have_jbig
   JPEG v1           --with-jpeg=$with_jpeg		$have_jpeg
   LCMS              --with-lcms=$with_lcms		$have_lcms
-  LIBJPEG2          --with-openjp2=$with_openjp2		$have_openjp2
   LQR               --with-lqr=$with_lqr		$have_lqr
   LTDL              --with-ltdl=$with_ltdl		$have_ltdl
   LZMA              --with-lzma=$with_lzma		$have_lzma
   Magick++          --with-magick-plus-plus=$with_magick_plus_plus	$have_magick_plus_plus
   OpenEXR           --with-openexr=$with_openexr		$have_openexr
+  OpenJP2           --with-openjp2=$with_openjp2		$have_openjp2
   PANGO             --with-pango=$with_pango		$have_pango
   PERL              --with-perl=$with_perl		$have_perl
   PNG               --with-png=$with_png		$have_png