commit 3fac9ec43830fab0a3f88bff607734eb99ea6b1c
author cristy <urban-warrior@git.imagemagick.org> Thu Nov 17 18:04:39 2011 +0000
committer cristy <urban-warrior@git.imagemagick.org> Thu Nov 17 18:04:39 2011 +0000
tree 66fac77faff342c5b3b995697999cc50286fd2c4
parent 28af11ea34404a57f22735df4dd2fbfca54c8f82

MagickCore/identify.c

diff --git a/MagickCore/identify.c b/MagickCore/identify.c
index 1cffefe..4c78109 100644
--- a/MagickCore/identify.c
+++ b/MagickCore/identify.c
@@ -521,8 +521,8 @@
       if (colorspace != GRAYColorspace)
         {
           (void) FormatLocaleFile(file,"  Image statistics:\n");
-          (void) PrintChannelStatistics(file,MaxPixelChannels,"Overall",
-            1.0/scale,channel_statistics);
+          (void) PrintChannelStatistics(file,(PixelChannel) MaxPixelChannels,
+            "Overall",1.0/scale,channel_statistics);
         }
       channel_statistics=(ChannelStatistics *) RelinquishMagickMemory(
         channel_statistics);

MagickCore/pixel.c

diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c
index 193d63e..11de725 100644
--- a/MagickCore/pixel.c
+++ b/MagickCore/pixel.c
@@ -3653,40 +3653,40 @@
   assert(image->signature == MagickSignature);
   for (i=0; i < (ssize_t) MaxPixelChannels; i++)
   {
-    SetPixelChannelMapChannel(image,(PixelChannel) i,(PixelTrait) 0);
+    SetPixelChannelMapChannel(image,(PixelChannel) i,(PixelChannel) 0);
     SetPixelChannelMapTraits(image,(PixelChannel) i,UndefinedPixelTrait);
   }
   n=0;
-  SetPixelChannelMapChannel(image,RedPixelChannel,(PixelTrait) n++);
+  SetPixelChannelMapChannel(image,RedPixelChannel,(PixelChannel) n++);
   SetPixelChannelMapTraits(image,RedPixelChannel,(PixelTrait)
     (UpdatePixelTrait | BlendPixelTrait));
-  SetPixelChannelMapChannel(image,GreenPixelChannel,(PixelTrait) n++);
+  SetPixelChannelMapChannel(image,GreenPixelChannel,(PixelChannel) n++);
   SetPixelChannelMapTraits(image,GreenPixelChannel,(PixelTrait)
     (UpdatePixelTrait | BlendPixelTrait));
-  SetPixelChannelMapChannel(image,BluePixelChannel,(PixelTrait) n++);
+  SetPixelChannelMapChannel(image,BluePixelChannel,(PixelChannel) n++);
   SetPixelChannelMapTraits(image,BluePixelChannel,(PixelTrait)
     (UpdatePixelTrait | BlendPixelTrait));
   if (image->colorspace == GRAYColorspace)
     {
       n=0;
-      SetPixelChannelMapChannel(image,RedPixelChannel,(PixelTrait) n);
-      SetPixelChannelMapChannel(image,GreenPixelChannel,(PixelTrait) n);
-      SetPixelChannelMapChannel(image,BluePixelChannel,(PixelTrait) n++);
+      SetPixelChannelMapChannel(image,RedPixelChannel,(PixelChannel) n);
+      SetPixelChannelMapChannel(image,GreenPixelChannel,(PixelChannel) n);
+      SetPixelChannelMapChannel(image,BluePixelChannel,(PixelChannel) n++);
     }
   if (image->colorspace == CMYKColorspace)
     {
-      SetPixelChannelMapChannel(image,BlackPixelChannel,(PixelTrait) n++);
+      SetPixelChannelMapChannel(image,BlackPixelChannel,(PixelChannel) n++);
       SetPixelChannelMapTraits(image,BlackPixelChannel,(PixelTrait)
         (UpdatePixelTrait | BlendPixelTrait));
     }
   if (image->storage_class == PseudoClass)
     {
-      SetPixelChannelMapChannel(image,IndexPixelChannel,(PixelTrait) n++);
+      SetPixelChannelMapChannel(image,IndexPixelChannel,(PixelChannel) n++);
       SetPixelChannelMapTraits(image,IndexPixelChannel,CopyPixelTrait);
     }
   if (image->matte != MagickFalse)
     {
-      SetPixelChannelMapChannel(image,AlphaPixelChannel,(PixelTrait) n++);
+      SetPixelChannelMapChannel(image,AlphaPixelChannel,(PixelChannel) n++);
       SetPixelChannelMapTraits(image,AlphaPixelChannel,CopyPixelTrait);
     }
   n+=image->number_meta_channels;
@@ -5469,8 +5469,8 @@
   for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
     SetPixelChannelMapTraits(image,(PixelChannel) i,
       GetChannelBit(channel_mask,i) == 0 ? CopyPixelTrait :
-      image->matte == MagickFalse ? UpdatePixelTrait :
-      UpdatePixelTrait | BlendPixelTrait);
+      image->matte == MagickFalse ? UpdatePixelTrait : (PixelTrait)
+      (UpdatePixelTrait | BlendPixelTrait));
   for ( ; i < MaxPixelChannels; i++)
     SetPixelChannelMapTraits(image,(PixelChannel) i,UndefinedPixelTrait);
   if (image->storage_class == PseudoClass)

MagickCore/profile.c

diff --git a/MagickCore/profile.c b/MagickCore/profile.c
index c3f92f3..7461072 100644
--- a/MagickCore/profile.c
+++ b/MagickCore/profile.c
@@ -103,7 +103,7 @@
 /*
   Typedef declarations
 */
-struct ProfileInfo
+struct _ProfileInfo
 {
   char
     *name;