(no commit message)

diff --git a/MagickCore/cipher.c b/MagickCore/cipher.c
index cc0f27d7d45589fbe177139df29a0033bceadc1a..4c28f32e68bc1b1b4967efdcf99f695c32afc279 100644 (file)
--- a/MagickCore/cipher.c
+++ b/MagickCore/cipher.c
@@ -690,7 +690,7 @@ MagickExport MagickBooleanType PasskeyDecipherImage(Image *image,
     (void) CopyMagickMemory(output_block,input_block,AESBlocksize*
       sizeof(*output_block));
     EncipherAESBlock(aes_info,output_block,output_block);
-    for (i=0; x < length; x++)
+    for (i=0; x < (ssize_t) length; x++)
     {
       p[i]^=output_block[i];
       i++;
@@ -910,7 +910,7 @@ MagickExport MagickBooleanType PasskeyEncipherImage(Image *image,
     (void) CopyMagickMemory(output_block,input_block,AESBlocksize*
       sizeof(*output_block));
     EncipherAESBlock(aes_info,output_block,output_block);
-    for (i=0; x < length; x++)
+    for (i=0; x < (ssize_t) length; x++)
     {
       p[i]^=output_block[i];
       i++;

diff --git a/MagickCore/image-private.h b/MagickCore/image-private.h
index 7fb31de3f18be2966bffac7027fc057297486984..11d42a15a783e95ba7d3ea69dea15cd68a037b58 100644 (file)
--- a/MagickCore/image-private.h
+++ b/MagickCore/image-private.h
@@ -31,6 +31,24 @@ extern "C" {
 #define UndefinedTicksPerSecond  100L
 #define UndefinedCompressionQuality  0UL
 
+extern MagickExport const char
+  BackgroundColor[],
+  BorderColor[],
+  DefaultTileFrame[],
+  DefaultTileGeometry[],
+  DefaultTileLabel[],
+  ForegroundColor[],
+  MatteColor[],
+  LoadImageTag[],
+  LoadImagesTag[],
+  PSDensityGeometry[],
+  PSPageGeometry[],
+  SaveImageTag[],
+  SaveImagesTag[];
+
+extern MagickExport const double
+  DefaultResolution;
+
 static inline double DegreesToRadians(const double degrees)
 {
   return((double) (MagickPI*degrees/180.0));

diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h
index 2d2ce9d4c522634a96e48a4d31a5b8340c034eaf..db7b2c9f6f57044cdb3093fae1783b158c4de726 100644 (file)
--- a/MagickCore/magick-config.h
+++ b/MagickCore/magick-config.h
@@ -1229,7 +1229,7 @@
 
 /* Define to the system default library search path. */
 #ifndef MAGICKCORE_LT_DLSEARCH_PATH
-#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/atlas:/usr/lib/llvm:/usr/lib64/llvm:/usr/local/lib:/usr/lib64/mysql:/usr/lib64/nvidia:/usr/lib64/qt-3.3/lib:/usr/lib64/tcl8.5/tclx8.4:/usr/lib64/tcl8.5:/usr/lib64/tracker-0.14:/usr/lib/wine/:/usr/lib64/wine/:/usr/lib64/xulrunner-2"
+#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/atlas:/usr/lib64/freetype-freeworld:/usr/lib/llvm:/usr/lib64/llvm:/usr/local/lib:/usr/lib64/mysql:/usr/lib64/nvidia:/usr/lib64/qt-3.3/lib:/usr/lib64/tcl8.5/tclx8.4:/usr/lib64/tcl8.5:/usr/lib64/tracker-0.14:/usr/lib/wine/:/usr/lib64/wine/:/usr/lib64/xulrunner-2"
 #endif
 
 /* The archive extension */

diff --git a/MagickWand/magick-image.c b/MagickWand/magick-image.c
index 07aa1b561c9d01a65c81735101a7c83f89a259d3..1b0e09d254c1e1443bbfb869ca12f0c3a62b5145 100644 (file)
--- a/MagickWand/magick-image.c
+++ b/MagickWand/magick-image.c
@@ -7619,7 +7619,7 @@ WandExport MagickBooleanType MagickPolaroidImage(MagickWand *wand,
 %  The format of the MagickPosterizeImage method is:
 %
 %      MagickBooleanType MagickPosterizeImage(MagickWand *wand,
-%        const size_t levels,const MagickBooleanType dither)
+%        const size_t levels,const DitherMethod method)
 %
 %  A description of each parameter follows:
 %
@@ -7628,12 +7628,12 @@ WandExport MagickBooleanType MagickPolaroidImage(MagickWand *wand,
 %    o levels: Number of color levels allowed in each channel.  Very low values
 %      (2, 3, or 4) have the most visible effect.
 %
-%    o dither: Set this integer value to something other than zero to dither
-%      the mapped image.
+%    o method: choose the dither method: UndefinedDitherMethod,
+%      NoDitherMethod, RiemersmaDitherMethod, or FloydSteinbergDitherMethod.
 %
 */
 WandExport MagickBooleanType MagickPosterizeImage(MagickWand *wand,
-  const size_t levels,const MagickBooleanType dither)
+  const size_t levels,const DitherMethod dither)
 {
   MagickBooleanType
     status;

diff --git a/MagickWand/magick-image.h b/MagickWand/magick-image.h
index b4eea3bac869aecfa7b729469693c8bfcd0c9415..d8773588bb505d49e1f56eeb7b853ec1c0101ff0 100644 (file)
--- a/MagickWand/magick-image.h
+++ b/MagickWand/magick-image.h
@@ -204,7 +204,7 @@ extern WandExport MagickBooleanType
   MagickPingImageFile(MagickWand *,FILE *),
   MagickPolaroidImage(MagickWand *,const DrawingWand *,const char *,
     const double,const PixelInterpolateMethod),
-  MagickPosterizeImage(MagickWand *,const size_t,const MagickBooleanType),
+  MagickPosterizeImage(MagickWand *,const size_t,const DitherMethod),
   MagickPreviousImage(MagickWand *),
   MagickQuantizeImage(MagickWand *,const size_t,const ColorspaceType,
     const size_t,const DitherMethod,const MagickBooleanType),

diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index 4beebb1b8a2a66ce7a47b54ee9546b96c1327c38..510d34f0722be8b5e34dc800fe69b6b7a24e6c90 100644 (file)
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -7442,7 +7442,7 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info,
                 "compose:clip-to-self")); /* if this is true */
             if (IsMagickFalse(clip_to_self)) /* or */
               clip_to_self=IfMagickFalse(IsStringNotFalse(GetImageOption(
-                mogrify_info,"compose:outside-overlay"))); /* this false */
+                mogrify_info,"compose:outside-overlay"))) ? MagickTrue : MagickFalse; /* this false */
             image=RemoveFirstImageFromList(images);
             composite_image=RemoveFirstImageFromList(images);
             if (composite_image == (Image *) NULL)

diff --git a/coders/fax.c b/coders/fax.c
index f424923cf555debeaf0971a893d7fc9127dece80..665b2e4ef14d93d70bd7e6e5f407fdb2e84a9527 100644 (file)
--- a/coders/fax.c
+++ b/coders/fax.c
@@ -40,6 +40,7 @@
   Include declarations.
 */
 #include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
 #include "MagickCore/blob.h"
 #include "MagickCore/blob-private.h"
 #include "MagickCore/colormap.h"
@@ -330,7 +331,8 @@ static MagickBooleanType WriteFAXImage(const ImageInfo *image_info,Image *image,
     /*
       Convert MIFF to monochrome.
     */
-    if (IssRGBColorspace(image->colorspace) == MagickFalse)
+    if ((IssRGBColorspace(image->colorspace) == MagickFalse) &&
+        (IsImageGray(image,exception) == MagickFalse))
       (void) TransformImageColorspace(image,sRGBColorspace,exception);
     status=HuffmanEncodeImage(write_info,image,image,exception);
     if (GetNextImageInList(image) == (Image *) NULL)

diff --git a/coders/fits.c b/coders/fits.c
index dfe5be92e3fcd6aac54e6cb10999dfc4c30a205d..1af8d9ccfa1cbe7419b84b171a5da0dc18433be1 100644 (file)
--- a/coders/fits.c
+++ b/coders/fits.c
@@ -636,6 +636,9 @@ static MagickBooleanType WriteFITSImage(const ImageInfo *image_info,
   status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
   if (status == MagickFalse)
     return(status);
+  if ((IssRGBColorspace(image->colorspace) == MagickFalse) &&
+      (IsImageGray(image,exception) == MagickFalse))
+    (void) TransformImageColorspace(image,sRGBColorspace,exception);
   /*
     Allocate image memory.
   */
@@ -737,8 +740,6 @@ static MagickBooleanType WriteFITSImage(const ImageInfo *image_info,
     }
   else
     {
-      if (IssRGBColorspace(image->colorspace) == MagickFalse)
-        (void) TransformImageColorspace(image,sRGBColorspace,exception);
       length=GetQuantumExtent(image,quantum_info,RedQuantum);
       for (y=(ssize_t) image->rows-1; y >= 0; y--)
       {

diff --git a/coders/fpx.c b/coders/fpx.c
index 67c5b76150fdec15a13c7018b64cf6fda75475d6..3e1e841236f9806d8f6927ec7bee0f1c4b584fac 100644 (file)
--- a/coders/fpx.c
+++ b/coders/fpx.c
@@ -853,6 +853,9 @@ static MagickBooleanType WriteFPXImage(const ImageInfo *image_info,Image *image,
   status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
   if (status == MagickFalse)
     return(status);
+  if ((IssRGBColorspace(image->colorspace) == MagickFalse) &&
+      (IsImageGray(image,exception) == MagickFalse))
+    (void) TransformImageColorspace(image,sRGBColorspace,exception);
   (void) CloseBlob(image);
   /*
     Initialize FPX toolkit.
@@ -873,9 +876,6 @@ static MagickBooleanType WriteFPXImage(const ImageInfo *image_info,Image *image,
       colorspace.numberOfComponents=1;
       colorspace.theComponents[0].myColor=MONOCHROME;
     }
-  else
-    if (IssRGBColorspace(image->colorspace) == MagickFalse)
-      (void) TransformImageColorspace(image,sRGBColorspace,exception);
   background_color.color1_value=0;
   background_color.color2_value=0;
   background_color.color3_value=0;

diff --git a/coders/gray.c b/coders/gray.c
index 20723099734277da141e03467741c206cd3ea9fb..ce601f31fbd015ae175962b31fac7982cd44cc68 100644 (file)
--- a/coders/gray.c
+++ b/coders/gray.c
@@ -40,6 +40,7 @@
   Include declarations.
 */
 #include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
 #include "MagickCore/blob.h"
 #include "MagickCore/blob-private.h"
 #include "MagickCore/cache.h"
@@ -411,7 +412,8 @@ static MagickBooleanType WriteGRAYImage(const ImageInfo *image_info,
     /*
       Write grayscale pixels.
     */
-    if (IssRGBColorspace(image->colorspace) == MagickFalse)
+    if ((IssRGBColorspace(image->colorspace) == MagickFalse) &&
+        (IsImageGray(image,exception) == MagickFalse))
       (void) TransformImageColorspace(image,sRGBColorspace,exception);
     quantum_type=GrayQuantum;
     quantum_info=AcquireQuantumInfo(image_info,image);

diff --git a/coders/jbig.c b/coders/jbig.c
index 9d11b8f655b2d4e22bb24f9ecf43cd669db2de75..36ca5b454888ca4fa5c81d27f715b26c4e0cf230 100644 (file)
--- a/coders/jbig.c
+++ b/coders/jbig.c
@@ -446,7 +446,8 @@ static MagickBooleanType WriteJBIGImage(const ImageInfo *image_info,
     /*
       Allocate pixel data.
     */
-    if (IssRGBColorspace(image->colorspace) == MagickFalse)
+    if ((IssRGBColorspace(image->colorspace) == MagickFalse) &&
+        (IsImageGray(image,exception) == MagickFalse))
       (void) TransformImageColorspace(image,sRGBColorspace,exception);
     number_packets=(image->columns+7)/8;
     pixels=(unsigned char *) AcquireQuantumMemory(number_packets,

diff --git a/coders/jp2.c b/coders/jp2.c
index 47b3b807176c983798cfa43a74a58398992c6cc1..18c36c5b50c7555810598c44ae9815f81d18a828 100644 (file)
--- a/coders/jp2.c
+++ b/coders/jp2.c
@@ -911,7 +911,8 @@ static MagickBooleanType WriteJP2Image(const ImageInfo *image_info,Image *image,
   /*
     Initialize JPEG 2000 API.
   */
-  if (IssRGBColorspace(image->colorspace) == MagickFalse)
+  if ((IssRGBColorspace(image->colorspace) == MagickFalse) &&
+      (IsImageGray(image,exception) == MagickFalse))
     (void) TransformImageColorspace(image,sRGBColorspace,exception);
   jp2_stream=JP2StreamManager(image);
   if (jp2_stream == (jas_stream_t *) NULL)

diff --git a/coders/mat.c b/coders/mat.c
index a76b4b740ae27fd7f5d1adb33a043cddd9b44852..5e94865470fb4529a5a093c03b1dad64e6f7fd9d 100644 (file)
--- a/coders/mat.c
+++ b/coders/mat.c
@@ -1239,11 +1239,10 @@ static MagickBooleanType WriteMATImage(const ImageInfo *image_info,Image *image,
   scene=0;
   do
   {
-
+    if ((IssRGBColorspace(image->colorspace) == MagickFalse) &&
+        (IsImageGray(image,exception) == MagickFalse))
+      (void) TransformImageColorspace(image,sRGBColorspace,exception);
     is_gray = IsImageGray(image,exception);
-    if (is_gray == MagickFalse)
-      if (IssRGBColorspace(image->colorspace) == MagickFalse)
-        (void) TransformImageColorspace(image,sRGBColorspace,exception);
     z = is_gray ? 0 : 3;
 
     /*

diff --git a/coders/mono.c b/coders/mono.c
index c5d154bbae16307af6f62a685807f3a8cb77b020..27955aa1f2ffe66c3250c960d820ba64490842ad 100644 (file)
--- a/coders/mono.c
+++ b/coders/mono.c
@@ -40,6 +40,7 @@
   Include declarations.
 */
 #include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
 #include "MagickCore/blob.h"
 #include "MagickCore/blob-private.h"
 #include "MagickCore/cache.h"
@@ -313,7 +314,8 @@ static MagickBooleanType WriteMONOImage(const ImageInfo *image_info,
   status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
   if (status == MagickFalse)
     return(status);
-  if (IssRGBColorspace(image->colorspace) == MagickFalse)
+  if ((IssRGBColorspace(image->colorspace) == MagickFalse) &&
+      (IsImageGray(image,exception) == MagickFalse))
     (void) TransformImageColorspace(image,sRGBColorspace,exception);
   /*
     Convert image to a bi-level image.

diff --git a/coders/otb.c b/coders/otb.c
index 5f16098fb6c87f9ad36bfc47f32aaa553dfe797e..b8828bc9f26dd30f02b4941e89371b3ea784aed4 100644 (file)
--- a/coders/otb.c
+++ b/coders/otb.c
@@ -39,6 +39,7 @@
   Include declarations.
 */
 #include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
 #include "MagickCore/blob.h"
 #include "MagickCore/blob-private.h"
 #include "MagickCore/cache.h"
@@ -333,7 +334,8 @@ static MagickBooleanType WriteOTBImage(const ImageInfo *image_info,Image *image,
   status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
   if (status == MagickFalse)
     return(status);
-  if (IssRGBColorspace(image->colorspace) == MagickFalse)
+  if ((IssRGBColorspace(image->colorspace) == MagickFalse) &&
+      (IsImageGray(image,exception) == MagickFalse))
     (void) TransformImageColorspace(image,sRGBColorspace,exception);
   /*
     Convert image to a bi-level image.

diff --git a/coders/pcl.c b/coders/pcl.c
index e4e51746fa12bbf99c44401767632bbe9241a701..8a28aeb8f02d87071734b5d0eecad6b9d004b840 100644 (file)
--- a/coders/pcl.c
+++ b/coders/pcl.c
@@ -721,7 +721,8 @@ static MagickBooleanType WritePCLImage(const ImageInfo *image_info,Image *image,
   one=1;
   do
   {
-    if (IssRGBColorspace(image->colorspace) == MagickFalse)
+    if ((IssRGBColorspace(image->colorspace) == MagickFalse) &&
+        (IsImageGray(image,exception) == MagickFalse))
       (void) TransformImageColorspace(image,sRGBColorspace,exception);
     /*
       Initialize the printer.

diff --git a/coders/pcx.c b/coders/pcx.c
index c8052cfcf3890969920fd268ab3cd67d99eb73d7..bc0233acbada9cca8c23121e01926306a771e923 100644 (file)
--- a/coders/pcx.c
+++ b/coders/pcx.c
@@ -879,7 +879,8 @@ static MagickBooleanType WritePCXImage(const ImageInfo *image_info,Image *image,
   status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
   if (status == MagickFalse)
     return(status);
-  if (IssRGBColorspace(image->colorspace) == MagickFalse)
+  if ((IssRGBColorspace(image->colorspace) == MagickFalse) &&
+      (IsImageGray(image,exception) == MagickFalse))
     (void) TransformImageColorspace(image,sRGBColorspace,exception);
   page_table=(MagickOffsetType *) NULL;
   if ((LocaleCompare(image_info->magick,"DCX") == 0) ||

diff --git a/coders/pdb.c b/coders/pdb.c
index d1187a9aa76f565c31268a905bebead8fb482b31..1fca1b3ecf8eb0e68843cec1cdc6349243f1e7d0 100644 (file)
--- a/coders/pdb.c
+++ b/coders/pdb.c
@@ -743,9 +743,9 @@ static MagickBooleanType WritePDBImage(const ImageInfo *image_info,Image *image,
   status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
   if (status == MagickFalse)
     return(status);
-  if (IssRGBColorspace(image->colorspace) == MagickFalse)
+  if ((IssRGBColorspace(image->colorspace) == MagickFalse) &&
+      (IsImageGray(image,exception) == MagickFalse))
     (void) TransformImageColorspace(image,sRGBColorspace,exception);
-
   if (image -> colors <= 2  ||  GetImageType( image, exception ) == BilevelType) { /* TS */
     bits_per_pixel = 1;
   } else if (image -> colors <= 4) {

diff --git a/coders/png.c b/coders/png.c
index b098c4043729e45e6ccf4b088a89638019d90706..8d92d1ffb265ea5c59bfc0a2c512b70baf103d98 100644 (file)
--- a/coders/png.c
+++ b/coders/png.c
@@ -1131,7 +1131,7 @@ static inline ssize_t MagickMax(const ssize_t x,const ssize_t y)
   return(y);
 }
 
-static char *
+static const char *
 Magick_ColorType_from_PNG_ColorType(const int ping_colortype)
 {
   switch (ping_colortype)

diff --git a/coders/pnm.c b/coders/pnm.c
index d4e9242748eb9eb510c492189d5c891ee8104f7e..5fa89189fbbc32aa93eff6370cb007e1dd4ba9b4 100644 (file)
--- a/coders/pnm.c
+++ b/coders/pnm.c
@@ -1564,7 +1564,8 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image,
       }
     if (format != '7')
       {
-        if (IssRGBColorspace(image->colorspace) == MagickFalse)
+        if ((IssRGBColorspace(image->colorspace) == MagickFalse) &&
+            (IsImageGray(image,exception) == MagickFalse))
           (void) TransformImageColorspace(image,sRGBColorspace,exception);
         (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g %.20g\n",
           (double) image->columns,(double) image->rows);

diff --git a/coders/ps.c b/coders/ps.c
index 0cb112f6e7640b899efcc4d24f86662b2939885a..137700b226224a5b321af474284cf6cc96b973ea 100644 (file)
--- a/coders/ps.c
+++ b/coders/ps.c
@@ -1443,11 +1443,10 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image,
     /*
       Scale relative to dots-per-inch.
     */
-    if ((image_info->type == TrueColorType) ||
-        (IsImageGray(image,exception) == MagickFalse))
-      if ((IssRGBColorspace(image->colorspace) == MagickFalse) &&
-          (image->colorspace != CMYKColorspace))
-        (void) TransformImageColorspace(image,sRGBColorspace,exception);
+    if ((IssRGBColorspace(image->colorspace) == MagickFalse) &&
+        (IsImageGray(image,exception) == MagickFalse) &&
+        (image->colorspace != CMYKColorspace))
+      (void) TransformImageColorspace(image,sRGBColorspace,exception);
     delta.x=DefaultResolution;
     delta.y=DefaultResolution;
     resolution.x=image->resolution.x;

diff --git a/coders/sun.c b/coders/sun.c
index a4c0ff1e0ef7b68ec3e2576559b26ebf30fcddcb..4a970d81910990d06ebf6925230afd51881165b5 100644 (file)
--- a/coders/sun.c
+++ b/coders/sun.c
@@ -761,7 +761,8 @@ static MagickBooleanType WriteSUNImage(const ImageInfo *image_info,Image *image,
     /*
       Initialize SUN raster file header.
     */
-    if (IssRGBColorspace(image->colorspace) == MagickFalse)
+    if ((IssRGBColorspace(image->colorspace) == MagickFalse) &&
+        (IsImageGray(image,exception) == MagickFalse))
       (void) TransformImageColorspace(image,sRGBColorspace,exception);
     sun_info.magic=0x59a66a95;
     if ((image->columns != (unsigned int) image->columns) ||

diff --git a/coders/vicar.c b/coders/vicar.c
index 855feda1a3b4dd9c789ea14297696e3715f3a9d1..87c99e41877e72aede9ce9403ef6dac5ac170e77 100644 (file)
--- a/coders/vicar.c
+++ b/coders/vicar.c
@@ -40,6 +40,7 @@
   Include declarations.
 */
 #include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
 #include "MagickCore/blob.h"
 #include "MagickCore/blob-private.h"
 #include "MagickCore/cache.h"
@@ -457,7 +458,8 @@ static MagickBooleanType WriteVICARImage(const ImageInfo *image_info,
   status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
   if (status == MagickFalse)
     return(status);
-  if (IssRGBColorspace(image->colorspace) == MagickFalse)
+  if ((IssRGBColorspace(image->colorspace) == MagickFalse) &&
+      (IsImageGray(image,exception) == MagickFalse))
     (void) TransformImageColorspace(image,sRGBColorspace,exception);
   /*
     Write header.

diff --git a/coders/viff.c b/coders/viff.c
index 7b01de16276bfac39130a31b633bd6883bae1602..a55f5d91440f098686d57cb3f9934f6753f99828 100644 (file)
--- a/coders/viff.c
+++ b/coders/viff.c
@@ -974,11 +974,9 @@ static MagickBooleanType WriteVIFFImage(const ImageInfo *image_info,
     /*
       Initialize VIFF image structure.
     */
-    if (IsImageGray(image,exception) != MagickFalse)
-      (void) SetImageStorageClass(image,DirectClass,exception);
-    else
-      if (IssRGBColorspace(image->colorspace) == MagickFalse)
-        (void) TransformImageColorspace(image,sRGBColorspace,exception);
+    if ((IssRGBColorspace(image->colorspace) == MagickFalse) &&
+        (IsImageGray(image,exception) == MagickFalse))
+      (void) TransformImageColorspace(image,sRGBColorspace,exception);
     viff_info.identifier=(char) 0xab;
     viff_info.file_type=1;
     viff_info.release=1;

diff --git a/coders/wbmp.c b/coders/wbmp.c
index 8fa4f5c827a617653b94d61aafd19671d3362059..4204818f30d3b23fb2fd8e8170ff60d88990ed1b 100644 (file)
--- a/coders/wbmp.c
+++ b/coders/wbmp.c
@@ -39,6 +39,7 @@
   Include declarations.
 */
 #include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
 #include "MagickCore/blob.h"
 #include "MagickCore/blob-private.h"
 #include "MagickCore/cache.h"
@@ -377,7 +378,8 @@ static MagickBooleanType WriteWBMPImage(const ImageInfo *image_info,
   status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
   if (status == MagickFalse)
     return(status);
-  if (IssRGBColorspace(image->colorspace) == MagickFalse)
+  if ((IssRGBColorspace(image->colorspace) == MagickFalse) &&
+      (IsImageGray(image,exception) == MagickFalse))
     (void) TransformImageColorspace(image,sRGBColorspace,exception);
   /*
     Convert image to a bi-level image.

diff --git a/coders/xbm.c b/coders/xbm.c
index c950b4886dabb4e2485b3c50486ecb7ff446a16c..2d8d92a59ed2510f06f4e19b98fe540541eb16a8 100644 (file)
--- a/coders/xbm.c
+++ b/coders/xbm.c
@@ -40,6 +40,7 @@
   Include declarations.
 */
 #include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
 #include "MagickCore/blob.h"
 #include "MagickCore/blob-private.h"
 #include "MagickCore/cache.h"
@@ -510,7 +511,8 @@ static MagickBooleanType WriteXBMImage(const ImageInfo *image_info,Image *image,
   status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
   if (status == MagickFalse)
     return(status);
-  if (IssRGBColorspace(image->colorspace) == MagickFalse)
+  if ((IssRGBColorspace(image->colorspace) == MagickFalse) &&
+      (IsImageGray(image,exception) == MagickFalse))
     (void) TransformImageColorspace(image,sRGBColorspace,exception);
   /*
     Write X bitmap header.

diff --git a/coders/xcf.c b/coders/xcf.c
index 3d699978cf56d9863d05cb717efb380ae66b0ded..cd82957cfae48565e1df41f4d88c5ce91d39116d 100644 (file)
--- a/coders/xcf.c
+++ b/coders/xcf.c
@@ -881,7 +881,7 @@ static MagickBooleanType ReadOneLayer(const ImageInfo *image_info,Image* image,
         scene;
 
       scene=inDocInfo->number_layers-layer-1;
-      if (scene > (image_info->scene+image_info->number_scenes-1))
+      if (scene > (ssize_t) (image_info->scene+image_info->number_scenes-1))
         {
           outLayer->image=CloneImage(image,0,0,MagickTrue,exception);
           if (outLayer->image == (Image *) NULL)

diff --git a/libtool b/libtool
index 1ba80c247b290d85a8bfd85b5e3c1fc38538eda1..2acdf2bdeb4243c508c8931972e70fed9560d8df 100755 (executable)
--- a/libtool
+++ b/libtool
@@ -278,7 +278,7 @@ hardcode_into_libs=yes
 sys_lib_search_path_spec="/usr/lib/gcc/x86_64-redhat-linux/4.7.0 /usr/lib64 /lib64 "
 
 # Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/lib64/atlas /usr/lib/llvm /usr/lib64/llvm /usr/local/lib /usr/lib64/mysql /usr/lib64/nvidia /usr/lib64/qt-3.3/lib /usr/lib64/tcl8.5/tclx8.4 /usr/lib64/tcl8.5 /usr/lib64/tracker-0.14 /usr/lib/wine/ /usr/lib64/wine/ /usr/lib64/xulrunner-2 "
+sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/lib64/atlas /usr/lib64/freetype-freeworld /usr/lib/llvm /usr/lib64/llvm /usr/local/lib /usr/lib64/mysql /usr/lib64/nvidia /usr/lib64/qt-3.3/lib /usr/lib64/tcl8.5/tclx8.4 /usr/lib64/tcl8.5 /usr/lib64/tracker-0.14 /usr/lib/wine/ /usr/lib64/wine/ /usr/lib64/xulrunner-2 "
 
 # Whether dlopen is supported.
 dlopen_support=yes