commit 00ac24b7dadc8fb5447c1b123bda8ff2379e905f
author dirk <dirk@git.imagemagick.org> Thu Jan 29 21:38:57 2015 +0000
committer dirk <dirk@git.imagemagick.org> Thu Jan 29 21:38:57 2015 +0000
tree 64c937a69719cf945d526d0ad1ea92d3b5e7ad3e
parent d873c4a941602fe7aad3a06900166a4da3eb56b8

Fixed hasChannel for gray images.

Magick++/lib/Image.cpp

diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp
index 559fc00..830c7bc 100644
--- a/Magick++/lib/Image.cpp
+++ b/Magick++/lib/Image.cpp
@@ -962,7 +962,13 @@
 
 bool Magick::Image::hasChannel(const PixelChannel channel) const
 {
-  return (GetPixelChannelTraits(constImage(),channel) != UndefinedPixelTrait);
+  if (GetPixelChannelTraits(constImage(),channel) == UndefinedPixelTrait)
+    return(false);
+
+  if (channel == GreenPixelChannel || channel == BluePixelChannel)
+    return (GetPixelChannelOffset(constImage(),channel) == (ssize_t)channel);
+
+  return(true);
 }
 
 void Magick::Image::highlightColor(const Color color_)

Magick++/lib/Magick++/Include.h

diff --git a/Magick++/lib/Magick++/Include.h b/Magick++/lib/Magick++/Include.h
index 39a269f..2fd11fb 100644
--- a/Magick++/lib/Magick++/Include.h
+++ b/Magick++/lib/Magick++/Include.h
@@ -1270,6 +1270,7 @@
   using MagickCore::GetNextValueInLinkedList;
   using MagickCore::GetNumberOfElementsInLinkedList;
   using MagickCore::GetPixelBlue;
+  using MagickCore::GetPixelChannelOffset;
   using MagickCore::GetPixelChannelTraits;
   using MagickCore::GetPixelGreen;
   using MagickCore::GetPixelInfo;