diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp
index 92d7ee0..3d379cb 100644
--- a/Magick++/lib/Image.cpp
+++ b/Magick++/lib/Image.cpp
@@ -524,21 +524,19 @@
}
// Set or obtain modulus channel depth
-void Magick::Image::channelDepth ( const ChannelType channel_,
- const size_t depth_)
+void Magick::Image::channelDepth ( const size_t depth_ )
{
modifyImage();
- SetImageChannelDepth( image(), channel_, depth_);
+ SetImageDepth( image(), depth_);
throwImageException();
}
-size_t Magick::Image::channelDepth ( const ChannelType channel_ )
+size_t Magick::Image::channelDepth ( )
{
size_t channel_depth;
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
- channel_depth=GetImageChannelDepth( constImage(), channel_,
- &exceptionInfo );
+ channel_depth=GetImageDepth( constImage(), &exceptionInfo );
throwException( exceptionInfo );
(void) DestroyExceptionInfo( &exceptionInfo );
return channel_depth;
diff --git a/Magick++/lib/Magick++/Image.h b/Magick++/lib/Magick++/Image.h
index 6f37b2e..57b0983 100644
--- a/Magick++/lib/Magick++/Image.h
+++ b/Magick++/lib/Magick++/Image.h
@@ -181,9 +181,8 @@
void channel ( const ChannelType channel_ );
// Set or obtain modulus channel depth
- void channelDepth ( const ChannelType channel_,
- const size_t depth_ );
- size_t channelDepth ( const ChannelType channel_ );
+ void channelDepth ( const size_t depth_ );
+ size_t channelDepth ( );
// Charcoal effect image (looks like charcoal sketch)
// The radius_ parameter specifies the radius of the Gaussian, in
diff --git a/Magick++/lib/Magick++/Include.h b/Magick++/lib/Magick++/Include.h
index de0846e..1269eb1 100644
--- a/Magick++/lib/Magick++/Include.h
+++ b/Magick++/lib/Magick++/Include.h
@@ -722,7 +722,7 @@
using MagickCore::GetExceptionInfo;
using MagickCore::GetGeometry;
using MagickCore::GetImageBoundingBox;
- using MagickCore::GetImageChannelDepth;
+ using MagickCore::GetImageDepth;
using MagickCore::GetImageChannelMean;
using MagickCore::GetImageChannelKurtosis;
using MagickCore::GetImageChannelRange;
@@ -845,7 +845,7 @@
using MagickCore::SetClientName;
using MagickCore::SetGeometry;
using MagickCore::SetImageBackgroundColor;
- using MagickCore::SetImageChannelDepth;
+ using MagickCore::SetImageDepth;
using MagickCore::SetImageClipMask;
using MagickCore::SetImageDepth;
using MagickCore::SetImageExtent;
diff --git a/MagickCore/attribute.c b/MagickCore/attribute.c
index 6237fd7..62e63f7 100644
--- a/MagickCore/attribute.c
+++ b/MagickCore/attribute.c
@@ -244,36 +244,27 @@
% %
% %
% %
-% G e t I m a g e C h a n n e l D e p t h %
+% G e t I m a g e D e p t h %
% %
% %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% GetImageChannelDepth() returns the depth of a particular image channel.
+% GetImageDepth() returns the depth of a particular image channel.
%
-% The format of the GetImageChannelDepth method is:
+% The format of the GetImageDepth method is:
%
% size_t GetImageDepth(const Image *image,ExceptionInfo *exception)
-% size_t GetImageChannelDepth(const Image *image,
-% const ChannelType channel,ExceptionInfo *exception)
%
% A description of each parameter follows:
%
% o image: the image.
%
-% o channel: the channel.
-%
% o exception: return any errors or warnings in this structure.
%
*/
-MagickExport size_t GetImageDepth(const Image *image,ExceptionInfo *exception)
-{
- return(GetImageChannelDepth(image,CompositeChannels,exception));
-}
-
-MagickExport size_t GetImageChannelDepth(const Image *image,
- const ChannelType channel,ExceptionInfo *exception)
+MagickExport size_t GetImageDepth(const Image *image,
+ ExceptionInfo *exception)
{
CacheView
*image_view;
@@ -784,18 +775,18 @@
% %
% %
% %
-% S e t I m a g e C h a n n e l D e p t h %
+% S e t I m a g e D e p t h %
% %
% %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% SetImageChannelDepth() sets the depth of the image.
+% SetImageDepth() sets the depth of the image.
%
-% The format of the SetImageChannelDepth method is:
+% The format of the SetImageDepth method is:
%
% MagickBooleanType SetImageDepth(Image *image,const size_t depth)
-% MagickBooleanType SetImageChannelDepth(Image *image,
+% MagickBooleanType SetImageDepth(Image *image,
% const ChannelType channel,const size_t depth)
%
% A description of each parameter follows:
@@ -810,12 +801,6 @@
MagickExport MagickBooleanType SetImageDepth(Image *image,
const size_t depth)
{
- return(SetImageChannelDepth(image,CompositeChannels,depth));
-}
-
-MagickExport MagickBooleanType SetImageChannelDepth(Image *image,
- const ChannelType channel,const size_t depth)
-{
CacheView
*image_view;
diff --git a/MagickCore/attribute.h b/MagickCore/attribute.h
index 029ef11..71f3753 100644
--- a/MagickCore/attribute.h
+++ b/MagickCore/attribute.h
@@ -32,14 +32,12 @@
IsImageGray(const Image *,ExceptionInfo *),
IsImageMonochrome(const Image *,ExceptionInfo *),
IsImageOpaque(const Image *,ExceptionInfo *),
- SetImageChannelDepth(Image *,const ChannelType,const size_t),
SetImageDepth(Image *,const size_t);
extern MagickExport RectangleInfo
GetImageBoundingBox(const Image *,ExceptionInfo *exception);
extern MagickExport size_t
- GetImageChannelDepth(const Image *,const ChannelType,ExceptionInfo *),
GetImageDepth(const Image *,ExceptionInfo *),
GetImageQuantumDepth(const Image *,const MagickBooleanType);
diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index 95aa658..b1f4791 100644
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -343,7 +343,7 @@
Darken is equivalent to a 'Minimum' method OR a greyscale version of a
binary 'Or' OR the 'Intersection' of pixel sets.
*/
- if ((channel & SyncChannels) == 0)
+ if (image->sync == MagickFalse)
{
/*
Handle channels as separate grayscale channels.
@@ -384,7 +384,7 @@
If 'Sync' flag select whole pixel based on alpha weighted intensity.
Otherwise use intensity only, but restrict copy according to channel.
*/
- if ((channel & SyncChannels) == 0)
+ if (image->sync == MagickFalse)
{
MagickBooleanType
from_p;
@@ -429,7 +429,7 @@
Sa=QuantumScale*p->alpha; /* simplify and speed up equations */
Da=QuantumScale*q->alpha;
- if ((channel & SyncChannels) == 0)
+ if (image->sync == MagickFalse)
{
/*
Handle channels as separate grayscale channels.
@@ -487,7 +487,7 @@
Sa=QuantumScale*p->alpha; /* simplify and speed up equations */
Da=QuantumScale*q->alpha;
- if ((channel & SyncChannels) == 0)
+ if (image->sync == MagickFalse)
{
/*
Handle channels as separate grayscale channels.
@@ -539,7 +539,7 @@
Sa=QuantumScale*p->alpha; /* simplify and speed up equations */
Da=QuantumScale*q->alpha;
- if ((channel & SyncChannels) == 0)
+ if (image->sync == MagickFalse)
{
/*
Handle channels as separate grayscale channels.
@@ -693,7 +693,7 @@
Lighten is also equvalent to a 'Maximum' method OR a greyscale version of a
binary 'And' OR the 'Union' of pixel sets.
*/
- if ((channel & SyncChannels) == 0)
+ if (image->sync == MagickFalse)
{
/*
Handle channels as separate grayscale channels
@@ -734,7 +734,7 @@
If 'Sync' flag select whole pixel based on alpha weighted intensity.
Otherwise use Intenisty only, but restrict copy according to channel.
*/
- if ((channel & SyncChannels) == 0)
+ if (image->sync == MagickFalse)
{
MagickBooleanType
from_p;
@@ -895,7 +895,7 @@
Sa=QuantumScale*p->alpha; /* ??? - AT */
Da=QuantumScale*q->alpha;
- if ((channel & SyncChannels) == 0)
+ if (image->sync == MagickFalse)
{
/*
Handle channels as separate grayscale channels.
@@ -949,7 +949,7 @@
The CompositePixelInfoPlus() function is defined in
"composite-private.h" so it can also be used for Image Blending.
*/
- if ((channel & SyncChannels) == 0)
+ if (image->sync == MagickFalse)
{
/*
Handle channels as separate grayscale channels.
@@ -992,7 +992,7 @@
Sa=QuantumScale*p->alpha; /* simplify and speed up equations */
Da=QuantumScale*q->alpha;
- if ((channel & SyncChannels) == 0)
+ if (image->sync == MagickFalse)
{
/*
Handle channels as separate grayscale channels.
@@ -1040,7 +1040,7 @@
gamma,
Sa;
- if ((channel & SyncChannels) == 0)
+ if (image->sync == MagickFalse)
{
/*
Handle channels as separate grayscale channels.
@@ -1091,7 +1091,7 @@
gamma,
Sa;
- if ((channel & SyncChannels) == 0)
+ if (image->sync == MagickFalse)
{
/*
Handle channels as separate grayscale channels,
@@ -1137,7 +1137,7 @@
Sa=QuantumScale*p->alpha; /* simplify and speed up equations */
Da=QuantumScale*q->alpha;
- if ((channel & SyncChannels) == 0)
+ if (image->sync == MagickFalse)
{
/*
Handle channels as separate grayscale channels.
@@ -1295,7 +1295,7 @@
Sa=QuantumScale*p->alpha; /* simplify and speed up equations */
Da=QuantumScale*q->alpha;
- if ((channel & SyncChannels) == 0)
+ if (image->sync == MagickFalse)
{
/*
Handle channels as separate grayscale channels.
diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index 9511b12..e209b57 100644
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -1183,9 +1183,8 @@
size_t
depth;
- depth=GetImageChannelDepth(image,channel,exception);
- (void) FormatLocaleString(statistic,MaxTextExtent,"%.20g",(double)
- depth);
+ depth=GetImageDepth(image,exception);
+ (void) FormatLocaleString(statistic,MaxTextExtent,"%.20g",(double) depth);
}
if (LocaleNCompare(symbol,"kurtosis",8) == 0)
{
@@ -1848,8 +1847,7 @@
MagickRealType
depth;
- depth=(MagickRealType) GetImageChannelDepth(image,channel,
- fx_info->exception);
+ depth=(MagickRealType) GetImageDepth(image,fx_info->exception);
return(depth);
}
break;
diff --git a/MagickCore/image.h b/MagickCore/image.h
index 0c99204..22e19c0 100644
--- a/MagickCore/image.h
+++ b/MagickCore/image.h
@@ -283,6 +283,9 @@
pixel_channels,
metacontent_extent;
+ MagickBooleanType
+ sync;
+
PixelComponentMap
*component_map;
diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h
index 2f9648e..9002a55 100644
--- a/MagickCore/magick-config.h
+++ b/MagickCore/magick-config.h
@@ -12,7 +12,9 @@
/* #undef AUTOTRACE_DELEGATE */
/* Define if coders and filters are to be built as modules. */
-/* #undef BUILD_MODULES */
+#ifndef MAGICKCORE_BUILD_MODULES
+#define MAGICKCORE_BUILD_MODULES 1
+#endif
/* Define if you have the bzip2 library */
#ifndef MAGICKCORE_BZLIB_DELEGATE
@@ -54,7 +56,9 @@
#endif
/* Define if you have DJVU library */
-/* #undef DJVU_DELEGATE */
+#ifndef MAGICKCORE_DJVU_DELEGATE
+#define MAGICKCORE_DJVU_DELEGATE 1
+#endif
/* Directory where ImageMagick documents live. */
#ifndef MAGICKCORE_DOCUMENTATION_PATH
@@ -76,7 +80,9 @@
#endif
/* Define if you have FFTW library */
-/* #undef FFTW_DELEGATE */
+#ifndef MAGICKCORE_FFTW_DELEGATE
+#define MAGICKCORE_FFTW_DELEGATE 1
+#endif
/* Location of filter modules */
#ifndef MAGICKCORE_FILTER_PATH
@@ -415,15 +421,15 @@
#endif
/* Define if you have the <lcms2.h> header file. */
-#ifndef MAGICKCORE_HAVE_LCMS2_H
-#define MAGICKCORE_HAVE_LCMS2_H 1
-#endif
+/* #undef HAVE_LCMS2_H */
/* Define if you have the <lcms2/lcms2.h> header file. */
/* #undef HAVE_LCMS2_LCMS2_H */
/* Define if you have the <lcms.h> header file. */
-/* #undef HAVE_LCMS_H */
+#ifndef MAGICKCORE_HAVE_LCMS_H
+#define MAGICKCORE_HAVE_LCMS_H 1
+#endif
/* Define if you have the <lcms/lcms.h> header file. */
/* #undef HAVE_LCMS_LCMS_H */
@@ -1146,7 +1152,9 @@
#endif
/* Define if you have JBIG library */
-/* #undef JBIG_DELEGATE */
+#ifndef MAGICKCORE_JBIG_DELEGATE
+#define MAGICKCORE_JBIG_DELEGATE 1
+#endif
/* Define if you have JPEG version 2 "Jasper" library */
#ifndef MAGICKCORE_JP2_DELEGATE
@@ -1175,7 +1183,9 @@
#endif
/* Define if you have LQR library */
-/* #undef LQR_DELEGATE */
+#ifndef MAGICKCORE_LQR_DELEGATE
+#define MAGICKCORE_LQR_DELEGATE 1
+#endif
/* Define if using libltdl to support dynamically loadable modules */
#ifndef MAGICKCORE_LTDL_DELEGATE
@@ -1187,7 +1197,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/lib64/mysql:/usr/lib64/qt-3.3/lib:/usr/lib64/tcl8.5/tclx8.4:/usr/lib64/tcl8.5:/usr/lib/wine/:/usr/lib64/wine/:/usr/lib64/xulrunner-2"
+#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/R/lib:/usr/lib64/atlas:/opt/modules/pkg/intel/f77/10.0.025/lib:/usr/local/lib:/usr/lib64/mysql:/usr/lib64/qt-3.3/lib:/usr/lib64/xulrunner-2"
#endif
/* The archive extension */
@@ -1238,7 +1248,9 @@
/* #undef NO_MINUS_C_MINUS_O */
/* Define if you have OPENEXR library */
-/* #undef OPENEXR_DELEGATE */
+#ifndef MAGICKCORE_OPENEXR_DELEGATE
+#define MAGICKCORE_OPENEXR_DELEGATE 1
+#endif
/* Define to the address where bug reports for this package should be sent. */
#ifndef MAGICKCORE_PACKAGE_BUGREPORT
@@ -1293,7 +1305,9 @@
#endif
/* Define if you have RSVG library */
-/* #undef RSVG_DELEGATE */
+#ifndef MAGICKCORE_RSVG_DELEGATE
+#define MAGICKCORE_RSVG_DELEGATE 1
+#endif
/* Define to the type of arg 1 for `select'. */
#ifndef MAGICKCORE_SELECT_TYPE_ARG1
@@ -1430,7 +1444,9 @@
/* Define if you have WEBP library */
-/* #undef WEBP_DELEGATE */
+#ifndef MAGICKCORE_WEBP_DELEGATE
+#define MAGICKCORE_WEBP_DELEGATE 1
+#endif
/* Define to use the Windows GDI32 library */
/* #undef WINGDI32_DELEGATE */
@@ -1439,7 +1455,9 @@
/* #undef WITH_DMALLOC */
/* Define if you have WMF library */
-/* #undef WMF_DELEGATE */
+#ifndef MAGICKCORE_WMF_DELEGATE
+#define MAGICKCORE_WMF_DELEGATE 1
+#endif
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
diff --git a/MagickCore/methods.h b/MagickCore/methods.h
index 28c9d8b..bd545a1 100644
--- a/MagickCore/methods.h
+++ b/MagickCore/methods.h
@@ -420,7 +420,7 @@
#define GetImageArtifact PrependMagickMethod(GetImageArtifact)
#define GetImageAttribute PrependMagickMethod(GetImageAttribute)
#define GetImageBoundingBox PrependMagickMethod(GetImageBoundingBox)
-#define GetImageChannelDepth PrependMagickMethod(GetImageChannelDepth)
+#define GetImageDepth PrependMagickMethod(GetImageDepth)
#define GetImageChannelDistortion PrependMagickMethod(GetImageChannelDistortion)
#define GetImageChannelDistortions PrependMagickMethod(GetImageChannelDistortions)
#define GetImageChannelExtrema PrependMagickMethod(GetImageChannelExtrema)
@@ -1063,7 +1063,7 @@
#define SetImageArtifact PrependMagickMethod(SetImageArtifact)
#define SetImageAttribute PrependMagickMethod(SetImageAttribute)
#define SetImageBackgroundColor PrependMagickMethod(SetImageBackgroundColor)
-#define SetImageChannelDepth PrependMagickMethod(SetImageChannelDepth)
+#define SetImageDepth PrependMagickMethod(SetImageDepth)
#define SetImageClipMask PrependMagickMethod(SetImageClipMask)
#define SetImageColorspace PrependMagickMethod(SetImageColorspace)
#define SetImageDepth PrependMagickMethod(SetImageDepth)
diff --git a/MagickCore/pixel-accessor.h b/MagickCore/pixel-accessor.h
index 29d877a..b685ac7 100644
--- a/MagickCore/pixel-accessor.h
+++ b/MagickCore/pixel-accessor.h
@@ -459,9 +459,15 @@
}
static inline void SetPixelComponent(const Image *image,
- const PixelComponent component,const PixelComponent component)
+ const PixelComponent component,const PixelComponent components)
{
- image->component_map[component].component=component;
+ image->component_map[component].component=components;
+}
+
+static inline void SetPixelComponentTraits(Image *image,
+ const PixelComponent component,const PixelTrait traits)
+{
+ image->component_map[component].traits=traits;
}
static inline void SetPixelCr(const Image *image,const Quantum cr,
@@ -600,12 +606,6 @@
SetPixelBlack(image,ClampToQuantum(pixel_info->black),packet);
}
-static inline void SetPixelComponentTraits(Image *image,
- const PixelComponent component,const PixelTrait traits)
-{
- image->component_map[component].traits=traits;
-}
-
static inline void SetPixelYellow(const Image *image,const Quantum yellow,
Quantum *pixel)
{
diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c
index b969afb..489215d 100644
--- a/MagickCore/pixel.c
+++ b/MagickCore/pixel.c
@@ -98,11 +98,10 @@
sizeof(*component_map));
if (component_map == (PixelComponentMap *) NULL)
ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
+ (void) ResetMagickMemory(component_map,0,MaxPixelComponents*
+ sizeof(*component_map));
for (i=0; i < MaxPixelComponents; i++)
- {
component_map[i].component=(PixelComponent) i;
- component_map[i].traits=UndefinedPixelTrait;
- }
return(component_map);
}
@@ -4462,6 +4461,7 @@
channel=(ChannelType) ParseChannelOption(components);
if (channel < 0)
channel=DefaultChannels;
+ image->sync=(channel & SyncChannels) != 0 ? MagickTrue : MagickFalse;
if ((channel & RedChannel) != 0)
SetPixelRedTraits(image,ActivePixelTrait);
if ((channel & GreenChannel) != 0)
diff --git a/MagickCore/version.h b/MagickCore/version.h
index e7a30e8..5287591 100644
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@
*/
#define MagickPackageName "ImageMagick"
#define MagickCopyright "Copyright (C) 1999-2011 ImageMagick Studio LLC"
-#define MagickSVNRevision "4693"
+#define MagickSVNRevision "exported"
#define MagickLibVersion 0x700
#define MagickLibVersionText "7.0.0"
#define MagickLibVersionNumber 5,0,0
#define MagickLibAddendum "-0"
#define MagickLibInterface 5
#define MagickLibMinInterface 5
-#define MagickReleaseDate "2011-07-02"
+#define MagickReleaseDate "2011-07-04"
#define MagickChangeDate "20110701"
#define MagickAuthoritativeURL "http://www.imagemagick.org"
#if defined(MAGICKCORE_OPENMP_SUPPORT)
diff --git a/MagickWand/magick-image.c b/MagickWand/magick-image.c
index 5ff8e3c..110ff1b 100644
--- a/MagickWand/magick-image.c
+++ b/MagickWand/magick-image.c
@@ -4161,43 +4161,6 @@
% %
% %
% %
-% M a g i c k G e t I m a g e C h a n n e l D e p t h %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MagickGetImageChannelDepth() gets the depth for one or more image channels.
-%
-% The format of the MagickGetImageChannelDepth method is:
-%
-% size_t MagickGetImageChannelDepth(MagickWand *wand,
-% const ChannelType channel)
-%
-% A description of each parameter follows:
-%
-% o wand: the magick wand.
-%
-% o channel: the image channel(s).
-%
-*/
-WandExport size_t MagickGetImageChannelDepth(MagickWand *wand,
- const ChannelType channel)
-{
- assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
- if (wand->debug != MagickFalse)
- (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- if (wand->images == (Image *) NULL)
- ThrowWandException(WandError,"ContainsNoImages",wand->name);
- return(GetImageChannelDepth(wand->images,channel,wand->exception));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
% M a g i c k G e t I m a g e C h a n n e l D i s t o r t i o n %
% %
% %
@@ -4835,7 +4798,7 @@
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
ThrowWandException(WandError,"ContainsNoImages",wand->name);
- return(wand->images->depth);
+ return(GetImageDepth(wand->images,wand->exception));
}
/*
@@ -9477,45 +9440,6 @@
% %
% %
% %
-% M a g i c k S e t I m a g e C h a n n e l D e p t h %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MagickSetImageChannelDepth() sets the depth of a particular image channel.
-%
-% The format of the MagickSetImageChannelDepth method is:
-%
-% MagickBooleanType MagickSetImageChannelDepth(MagickWand *wand,
-% const ChannelType channel,const size_t depth)
-%
-% A description of each parameter follows:
-%
-% o wand: the magick wand.
-%
-% o channel: the image channel(s).
-%
-% o depth: the image depth in bits.
-%
-*/
-WandExport MagickBooleanType MagickSetImageChannelDepth(MagickWand *wand,
- const ChannelType channel,const size_t depth)
-{
- assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
- if (wand->debug != MagickFalse)
- (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- if (wand->images == (Image *) NULL)
- ThrowWandException(WandError,"ContainsNoImages",wand->name);
- return(SetImageChannelDepth(wand->images,channel,depth));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
% M a g i c k S e t I m a g e C l i p M a s k %
% %
% %
@@ -9870,8 +9794,7 @@
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
ThrowWandException(WandError,"ContainsNoImages",wand->name);
- wand->images->depth=depth;
- return(MagickTrue);
+ return(SetImageDepth(wand->images,depth));
}
/*
diff --git a/MagickWand/magick-image.h b/MagickWand/magick-image.h
index 0678844..07f0ebc 100644
--- a/MagickWand/magick-image.h
+++ b/MagickWand/magick-image.h
@@ -282,7 +282,6 @@
MagickSetImageBias(MagickWand *,const double),
MagickSetImageBluePrimary(MagickWand *,const double,const double),
MagickSetImageBorderColor(MagickWand *,const PixelWand *),
- MagickSetImageChannelDepth(MagickWand *,const ChannelType,const size_t),
MagickSetImageClipMask(MagickWand *,const MagickWand *),
MagickSetImageColor(MagickWand *,const PixelWand *),
MagickSetImageColormapColor(MagickWand *,const size_t,
@@ -417,7 +416,6 @@
MagickGetImageColors(MagickWand *),
MagickGetImageCompressionQuality(MagickWand *),
MagickGetImageDelay(MagickWand *),
- MagickGetImageChannelDepth(MagickWand *,const ChannelType),
MagickGetImageDepth(MagickWand *),
MagickGetImageHeight(MagickWand *),
MagickGetImageIterations(MagickWand *),