(no commit message)

diff --git a/MagickCore/accelerate.c b/MagickCore/accelerate.c
index ceb05215050caf965c3b1f40dfb280703160cf18..8bfacefd5f0127930e1ecdc6804fa9ba1731e688 100644 (file)
--- a/MagickCore/accelerate.c
+++ b/MagickCore/accelerate.c
@@ -52,6 +52,7 @@
 #include "MagickCore/studio.h"
 #include "MagickCore/accelerate.h"
 #include "MagickCore/artifact.h"
+#include "MagickCore/cache.h"
 #include "MagickCore/cache-view.h"
 #include "MagickCore/color-private.h"
 #include "MagickCore/enhance.h"

diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index b1f4791b88d8df668284ffe618192ba4983fc785..9c100cd1e241d968eba7c3357748339f077c23b8 100644 (file)
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -79,30 +79,25 @@
 %                                                                             %
 %                                                                             %
 %                                                                             %
-%   C o m p o s i t e I m a g e C h a n n e l                                 %
+%   C o m p o s i t e I m a g e                                               %
 %                                                                             %
 %                                                                             %
 %                                                                             %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  CompositeImageChannel() returns the second image composited onto the first
+%  CompositeImage() returns the second image composited onto the first
 %  at the specified offset, using the specified composite method.
 %
-%  The format of the CompositeImageChannel method is:
+%  The format of the CompositeImage method is:
 %
 %      MagickBooleanType CompositeImage(Image *image,
 %        const CompositeOperator compose,Image *composite_image,
 %        const ssize_t x_offset,const ssize_t y_offset)
-%      MagickBooleanType CompositeImageChannel(Image *image,
-%        const ChannelType channel,const CompositeOperator compose,
-%        Image *composite_image,const ssize_t x_offset,const ssize_t y_offset)
 %
 %  A description of each parameter follows:
 %
 %    o image: the destination image, modified by he composition
 %
-%    o channel: the channel.
-%
 %    o compose: This operator affects how the composite is applied to
 %      the image.  The operators and how they are utilized are listed here
 %      http://www.w3.org/TR/SVG12/#compositing.
@@ -334,7 +329,7 @@ static inline MagickRealType Darken(const MagickRealType p,
 }
 
 static inline void CompositeDarken(const Image *image,const PixelInfo *p,
-  const PixelInfo *q,const ChannelType channel,PixelInfo *composite)
+  const PixelInfo *q,PixelInfo *composite)
 {
   MagickRealType
     gamma;
@@ -372,8 +367,7 @@ static inline void CompositeDarken(const Image *image,const PixelInfo *p,
 }
 
 static inline void CompositeDarkenIntensity(const Image *image,
-  const PixelInfo *p,const PixelInfo *q,const ChannelType channel,
-  PixelInfo *composite)
+  const PixelInfo *p,const PixelInfo *q,PixelInfo *composite)
 {
   MagickRealType
     Da,
@@ -420,7 +414,7 @@ static inline MagickRealType Difference(const MagickRealType p,
 }
 
 static inline void CompositeDifference(const Image *image,const PixelInfo *p,
-  const PixelInfo *q,const ChannelType channel,PixelInfo *composite)
+  const PixelInfo *q,PixelInfo *composite)
 {
   MagickRealType
     Da,
@@ -478,7 +472,7 @@ static MagickRealType Divide(const MagickRealType Sca,const MagickRealType Sa,
 }
 
 static inline void CompositeDivide(const Image *image,const PixelInfo *p,
-  const PixelInfo *q,const ChannelType channel,PixelInfo *composite)
+  const PixelInfo *q,PixelInfo *composite)
 {
   MagickRealType
     Da,
@@ -530,7 +524,7 @@ static MagickRealType Exclusion(const MagickRealType Sca,
 }
 
 static inline void CompositeExclusion(const Image *image,const PixelInfo *p,
-  const PixelInfo *q,const ChannelType channel,PixelInfo *composite)
+  const PixelInfo *q,PixelInfo *composite)
 {
   MagickRealType
     gamma,
@@ -684,7 +678,7 @@ static inline MagickRealType Lighten(const MagickRealType p,
 }
 
 static inline void CompositeLighten(const Image *image,const PixelInfo *p,
-  const PixelInfo *q,const ChannelType channel,PixelInfo *composite)
+  const PixelInfo *q,PixelInfo *composite)
 {
   MagickRealType
     gamma;
@@ -722,8 +716,7 @@ static inline void CompositeLighten(const Image *image,const PixelInfo *p,
 }
 
 static inline void CompositeLightenIntensity(const Image *image,
-  const PixelInfo *p,const PixelInfo *q,const ChannelType channel,
-  PixelInfo *composite)
+  const PixelInfo *p,const PixelInfo *q,PixelInfo *composite)
 {
   MagickRealType
     Da,
@@ -885,8 +878,7 @@ static inline MagickRealType Mathematics(const MagickRealType Sca,
 }
 
 static inline void CompositeMathematics(const Image *image,const PixelInfo *p,
-  const PixelInfo *q,const ChannelType channel, const GeometryInfo *args,
-  PixelInfo *composite)
+  const PixelInfo *q,const GeometryInfo *args,PixelInfo *composite)
 {
   MagickRealType
     Da,
@@ -932,7 +924,7 @@ static inline void CompositeMathematics(const Image *image,const PixelInfo *p,
 }
 
 static inline void CompositePlus(const Image *image,const PixelInfo *p,
-  const PixelInfo *q,const ChannelType channel,PixelInfo *composite)
+  const PixelInfo *q,PixelInfo *composite)
 {
   /*
     NOTE: "Plus" does not use 'over' alpha-blending but uses a special
@@ -983,7 +975,7 @@ static inline MagickRealType Minus(const MagickRealType Sca,
 }
 
 static inline void CompositeMinus(const Image *image,const PixelInfo *p,
-  const PixelInfo *q,const ChannelType channel,PixelInfo *composite)
+  const PixelInfo *q,PixelInfo *composite)
 {
   MagickRealType
     Da,
@@ -1033,7 +1025,7 @@ static inline MagickRealType ModulusAdd(const MagickRealType p,
 }
 
 static inline void CompositeModulusAdd(const Image *image,const PixelInfo *p,
-  const PixelInfo *q,const ChannelType channel,PixelInfo *composite)
+  const PixelInfo *q,PixelInfo *composite)
 {
   MagickRealType
     Da,
@@ -1083,8 +1075,7 @@ static inline MagickRealType ModulusSubtract(const MagickRealType p,
 }
 
 static inline void CompositeModulusSubtract(const Image *image,
-  const PixelInfo *p,const PixelInfo *q, const ChannelType channel,
-  PixelInfo *composite)
+  const PixelInfo *p,const PixelInfo *q,PixelInfo *composite)
 {
   MagickRealType
     Da,
@@ -1128,7 +1119,7 @@ static  inline MagickRealType Multiply(const MagickRealType Sca,
 }
 
 static inline void CompositeMultiply(const Image *image,const PixelInfo *p,
-  const PixelInfo *q,const ChannelType channel,PixelInfo *composite)
+  const PixelInfo *q,PixelInfo *composite)
 {
   MagickRealType
     Da,
@@ -1286,7 +1277,7 @@ static inline MagickRealType Screen(const MagickRealType Sca,
 }
 
 static inline void CompositeScreen(const Image *image,const PixelInfo *p,
-  const PixelInfo *q,const ChannelType channel,PixelInfo *composite)
+  const PixelInfo *q,PixelInfo *composite)
 {
   MagickRealType
     Da,
@@ -1554,18 +1545,6 @@ static void HSBComposite(const double hue,const double saturation,
 MagickExport MagickBooleanType CompositeImage(Image *image,
   const CompositeOperator compose,const Image *composite_image,
   const ssize_t x_offset,const ssize_t y_offset)
-{
-  MagickBooleanType
-    status;
-
-  status=CompositeImageChannel(image,DefaultChannels,compose,composite_image,
-    x_offset,y_offset);
-  return(status);
-}
-
-MagickExport MagickBooleanType CompositeImageChannel(Image *image,
-  const ChannelType channel,const CompositeOperator compose,
-  const Image *composite_image,const ssize_t x_offset,const ssize_t y_offset)
 {
 #define CompositeImageTag  "Composite/Image"
 
@@ -2395,86 +2374,83 @@ MagickExport MagickBooleanType CompositeImageChannel(Image *image,
         }
         case PlusCompositeOp:
         {
-          CompositePlus(image,&source,&destination,channel,&composite);
+          CompositePlus(image,&source,&destination,&composite);
           break;
         }
         case MinusDstCompositeOp:
         {
-          CompositeMinus(image,&source,&destination,channel,&composite);
+          CompositeMinus(image,&source,&destination,&composite);
           break;
         }
         case MinusSrcCompositeOp:
         {
-          CompositeMinus(image,&destination,&source,channel,&composite);
+          CompositeMinus(image,&destination,&source,&composite);
           break;
         }
         case ModulusAddCompositeOp:
         {
-          CompositeModulusAdd(image,&source,&destination,channel,&composite);
+          CompositeModulusAdd(image,&source,&destination,&composite);
           break;
         }
         case ModulusSubtractCompositeOp:
         {
-          CompositeModulusSubtract(image,&source,&destination,channel,
-            &composite);
+          CompositeModulusSubtract(image,&source,&destination,&composite);
           break;
         }
         case DifferenceCompositeOp:
         {
-          CompositeDifference(image,&source,&destination,channel,&composite);
+          CompositeDifference(image,&source,&destination,&composite);
           break;
         }
         case ExclusionCompositeOp:
         {
-          CompositeExclusion(image,&source,&destination,channel,&composite);
+          CompositeExclusion(image,&source,&destination,&composite);
           break;
         }
         case MultiplyCompositeOp:
         {
-          CompositeMultiply(image,&source,&destination,channel,&composite);
+          CompositeMultiply(image,&source,&destination,&composite);
           break;
         }
         case ScreenCompositeOp:
         {
-          CompositeScreen(image,&source,&destination,channel,&composite);
+          CompositeScreen(image,&source,&destination,&composite);
           break;
         }
         case DivideDstCompositeOp:
         {
-          CompositeDivide(image,&source,&destination,channel,&composite);
+          CompositeDivide(image,&source,&destination,&composite);
           break;
         }
         case DivideSrcCompositeOp:
         {
-          CompositeDivide(image,&destination,&source,channel,&composite);
+          CompositeDivide(image,&destination,&source,&composite);
           break;
         }
         case DarkenCompositeOp:
         {
-          CompositeDarken(image,&source,&destination,channel,&composite);
+          CompositeDarken(image,&source,&destination,&composite);
           break;
         }
         case LightenCompositeOp:
         {
-          CompositeLighten(image,&source,&destination,channel,&composite);
+          CompositeLighten(image,&source,&destination,&composite);
           break;
         }
         case DarkenIntensityCompositeOp:
         {
-          CompositeDarkenIntensity(image,&source,&destination,channel,
-            &composite);
+          CompositeDarkenIntensity(image,&source,&destination,&composite);
           break;
         }
         case LightenIntensityCompositeOp:
         {
-          CompositeLightenIntensity(image,&source,&destination,channel,
-            &composite);
+          CompositeLightenIntensity(image,&source,&destination,&composite);
           break;
         }
         case MathematicsCompositeOp:
         {
-          CompositeMathematics(image,&source,&destination,channel,
-            &geometry_info,&composite);
+          CompositeMathematics(image,&source,&destination,&geometry_info,
+            &composite);
           break;
         }
         case ColorDodgeCompositeOp:
@@ -2730,7 +2706,7 @@ MagickExport MagickBooleanType CompositeImageChannel(Image *image,
           proceed;
 
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp critical (MagickCore_CompositeImageChannel)
+  #pragma omp critical (MagickCore_CompositeImage)
 #endif
         proceed=SetImageProgress(image,CompositeImageTag,progress++,
           image->rows);

diff --git a/MagickCore/composite.h b/MagickCore/composite.h
index 68080942f8b78feafa2cc8bb5dcd6bf320321b78..19dea37146828d4ed4310dcdc70121881b686eca 100644 (file)
--- a/MagickCore/composite.h
+++ b/MagickCore/composite.h
@@ -97,8 +97,6 @@ typedef enum
 extern MagickExport MagickBooleanType
   CompositeImage(Image *,const CompositeOperator,const Image *,const ssize_t,
     const ssize_t),
-  CompositeImageChannel(Image *,const ChannelType,const CompositeOperator,
-    const Image *,const ssize_t,const ssize_t),
   TextureImage(Image *,const Image *);
 
 #if defined(__cplusplus) || defined(c_plusplus)

diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h
index 2f9648ec388052894fc27d24593a384f3abb65e9..9002a55f6ee8504fd986a62d36a0ca552edfb250 100644 (file)
--- 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 c787e45e32dbb04d144a9f205842ff16c301f2f2..907e45253078c181f2751fc3cfd1ec470c321d4d 100644 (file)
--- a/MagickCore/methods.h
+++ b/MagickCore/methods.h
@@ -189,7 +189,7 @@ extern "C" {
 #define CompareSplayTreeStringInfo  PrependMagickMethod(CompareSplayTreeStringInfo)
 #define CompareSplayTreeString  PrependMagickMethod(CompareSplayTreeString)
 #define CompareStringInfo  PrependMagickMethod(CompareStringInfo)
-#define CompositeImageChannel  PrependMagickMethod(CompositeImageChannel)
+#define CompositeImage  PrependMagickMethod(CompositeImage)
 #define CompositeImage  PrependMagickMethod(CompositeImage)
 #define CompositeLayers  PrependMagickMethod(CompositeLayers)
 #define CompressImageColormap  PrependMagickMethod(CompressImageColormap)

diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c
index aae2cd7ee0c08364e8606cdd3a0af85a6a903233..5239ef82f246b96b849e9f9f727e2834a52e876a 100644 (file)
--- a/MagickCore/morphology.c
+++ b/MagickCore/morphology.c
@@ -3852,8 +3852,7 @@ MagickExport Image *MorphologyApply(const Image *image, const ChannelType
       if ( method == VoronoiMorphology ) {
         /* Preserve the alpha channel of input image - but turned off */
         (void) SetImageAlphaChannel(rslt_image, DeactivateAlphaChannel);
-        (void) CompositeImageChannel(rslt_image, DefaultChannels,
-          CopyOpacityCompositeOp, image, 0, 0);
+        (void) CompositeImage(rslt_image,CopyOpacityCompositeOp,image,0,0);
         (void) SetImageAlphaChannel(rslt_image, DeactivateAlphaChannel);
       }
       goto exit_cleanup;
@@ -4080,17 +4079,14 @@ MagickExport Image *MorphologyApply(const Image *image, const ChannelType
           if ( verbose == MagickTrue )
             (void) FormatLocaleFile(stderr, "\n%s: Difference with original image",
                  CommandOptionToMnemonic(MagickMorphologyOptions, method) );
-          (void) CompositeImageChannel(curr_image,
-                  (ChannelType) (channel & ~SyncChannels),
-                  DifferenceCompositeOp, image, 0, 0);
+          (void) CompositeImage(curr_image,DifferenceCompositeOp,image,0,0);
           break;
         case EdgeMorphology:
           if ( verbose == MagickTrue )
             (void) FormatLocaleFile(stderr, "\n%s: Difference of Dilate and Erode",
                  CommandOptionToMnemonic(MagickMorphologyOptions, method) );
-          (void) CompositeImageChannel(curr_image,
-                  (ChannelType) (channel & ~SyncChannels),
-                  DifferenceCompositeOp, save_image, 0, 0);
+          (void) CompositeImage(curr_image,DifferenceCompositeOp,save_image,
+            0,0);
           save_image = DestroyImage(save_image); /* finished with save image */
           break;
         default:
@@ -4126,9 +4122,7 @@ MagickExport Image *MorphologyApply(const Image *image, const ChannelType
           if ( verbose == MagickTrue )
             (void) FormatLocaleFile(stderr, " (compose \"%s\")",
                  CommandOptionToMnemonic(MagickComposeOptions, rslt_compose) );
-          (void) CompositeImageChannel(rslt_image,
-               (ChannelType) (channel & ~SyncChannels), rslt_compose,
-               curr_image, 0, 0);
+          (void) CompositeImage(rslt_image,rslt_compose,curr_image,0,0);
           curr_image = DestroyImage(curr_image);
           curr_image = (Image *) image;  /* continue with original image */
         }

diff --git a/MagickCore/version.h b/MagickCore/version.h
index aa2cfd8384f7d14737aa2b873d848a6e337f897f..0b955d110c57f32a138d37eb5894a777fbb25807 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@ extern "C" {
 */
 #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

diff --git a/MagickWand/composite.c b/MagickWand/composite.c
index 6f22b8077e6a811216149074b26ab623e839553f..905faa984c0202986738f59e6c1c600a023ae55e 100644 (file)
--- a/MagickWand/composite.c
+++ b/MagickWand/composite.c
@@ -50,9 +50,6 @@
 */
 typedef struct _CompositeOptions
 {
-  ChannelType
-    channel;
-
   char
     *compose_args,
     *geometry;
@@ -189,8 +186,7 @@ static MagickBooleanType CompositeImageList(ImageInfo *image_info,Image **image,
               columns=composite_image->columns;
               for (y=0; y < (ssize_t) (*image)->rows; y+=(ssize_t) composite_image->rows)
                 for (x=0; x < (ssize_t) (*image)->columns; x+=(ssize_t) columns)
-                  status&=CompositeImageChannel(*image,
-                    composite_options->channel,composite_options->compose,
+                  status&=CompositeImage(*image,composite_options->compose,
                     composite_image,x,y);
               GetImageException(*image,exception);
             }
@@ -213,9 +209,8 @@ static MagickBooleanType CompositeImageList(ImageInfo *image_info,Image **image,
               /*
                 Digitally composite image.
               */
-              status&=CompositeImageChannel(*image,composite_options->channel,
-                composite_options->compose,composite_image,geometry.x,
-                geometry.y);
+              status&=CompositeImage(*image,composite_options->compose,
+                composite_image,geometry.x,geometry.y);
               GetImageException(*image,exception);
             }
     }
@@ -368,7 +363,6 @@ static MagickBooleanType CompositeUsage(void)
 static void GetCompositeOptions(CompositeOptions *composite_options)
 {
   (void) ResetMagickMemory(composite_options,0,sizeof(*composite_options));
-  composite_options->channel=DefaultChannels;
   composite_options->compose=OverCompositeOp;
 }
 
@@ -662,7 +656,7 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
 
             if (*option == '+')
               {
-                composite_options.channel=DefaultChannels;
+                SetPixelComponentMap(image,DefaultChannels);
                 break;
               }
             i++;
@@ -672,7 +666,7 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
             if (channel < 0)
               ThrowCompositeException(OptionError,"UnrecognizedChannelType",
                 argv[i]);
-            composite_options.channel=(ChannelType) channel;
+            SetPixelComponentMap(image,(ChannelType) channel);
             break;
           }
         if (LocaleCompare("colors",option+1) == 0)

diff --git a/MagickWand/magick-image.c b/MagickWand/magick-image.c
index 5f7ce97cf7c03f0932122e3252ef2ae16bfd225d..61c18e4ad64ab5080013c3e6177232ca1232a2b5 100644 (file)
--- a/MagickWand/magick-image.c
+++ b/MagickWand/magick-image.c
@@ -1874,9 +1874,6 @@ WandExport MagickWand *MagickCompareImages(MagickWand *wand,
 %      MagickBooleanType MagickCompositeImage(MagickWand *wand,
 %        const MagickWand *composite_wand,const CompositeOperator compose,
 %        const ssize_t x,const ssize_t y)
-%      MagickBooleanType MagickCompositeImageChannel(MagickWand *wand,
-%        const ChannelType channel,const MagickWand *composite_wand,
-%        const CompositeOperator compose,const ssize_t x,const ssize_t y)
 %
 %  A description of each parameter follows:
 %
@@ -1898,22 +1895,9 @@ WandExport MagickWand *MagickCompareImages(MagickWand *wand,
 %    o y: the row offset of the composited image.
 %
 */
-
 WandExport MagickBooleanType MagickCompositeImage(MagickWand *wand,
-  const MagickWand *composite_wand,const CompositeOperator compose,const ssize_t x,
-  const ssize_t y)
-{
-  MagickBooleanType
-    status;
-
-  status=MagickCompositeImageChannel(wand,DefaultChannels,composite_wand,
-    compose,x,y);
-  return(status);
-}
-
-WandExport MagickBooleanType MagickCompositeImageChannel(MagickWand *wand,
-  const ChannelType channel,const MagickWand *composite_wand,
-  const CompositeOperator compose,const ssize_t x,const ssize_t y)
+  const MagickWand *composite_wand,const CompositeOperator compose,
+  const ssize_t x,const ssize_t y)
 {
   MagickBooleanType
     status;
@@ -1925,8 +1909,7 @@ WandExport MagickBooleanType MagickCompositeImageChannel(MagickWand *wand,
   if ((wand->images == (Image *) NULL) ||
       (composite_wand->images == (Image *) NULL))
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
-  status=CompositeImageChannel(wand->images,channel,compose,
-    composite_wand->images,x,y);
+  status=CompositeImage(wand->images,compose,composite_wand->images,x,y);
   if (status == MagickFalse)
     InheritException(wand->exception,&wand->images->exception);
   return(status);

diff --git a/MagickWand/magick-image.h b/MagickWand/magick-image.h
index ee0719d91bca20b9d934fda1bd35721a8d726b0a..3401e517e675127f7bac670cbc5bfb1b0d596980 100644 (file)
--- a/MagickWand/magick-image.h
+++ b/MagickWand/magick-image.h
@@ -115,7 +115,6 @@ extern WandExport MagickBooleanType
   MagickCommentImage(MagickWand *,const char *),
   MagickCompositeImage(MagickWand *,const MagickWand *,const CompositeOperator,
     const ssize_t,const ssize_t),
-  MagickCompositeImageChannel(MagickWand *,const ChannelType,const MagickWand *,    const CompositeOperator,const ssize_t,const ssize_t),
   MagickConstituteImage(MagickWand *,const size_t,const size_t,const char *,
     const StorageType,const void *),
   MagickContrastImage(MagickWand *,const MagickBooleanType),

diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index aa29b8914602e65874d2cef1dbd1542f16798560..61152ca24a416cfaa6ba4d86b036bff30fe0b73a 100644 (file)
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -2432,8 +2432,8 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
                   Composite region.
                 */
                 (void) CompositeImage(region_image,region_image->matte !=
-                     MagickFalse ? CopyCompositeOp : OverCompositeOp,*image,
-                     region_geometry.x,region_geometry.y);
+                  MagickFalse ? CopyCompositeOp : OverCompositeOp,*image,
+                  region_geometry.x,region_geometry.y);
                 InheritException(exception,&region_image->exception);
                 *image=DestroyImage(*image);
                 *image=region_image;
@@ -3176,8 +3176,8 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
       */
       (void) SyncImageSettings(mogrify_info,*image);
       (void) CompositeImage(region_image,region_image->matte !=
-           MagickFalse ? CopyCompositeOp : OverCompositeOp,*image,
-           region_geometry.x,region_geometry.y);
+        MagickFalse ? CopyCompositeOp : OverCompositeOp,*image,
+        region_geometry.x,region_geometry.y);
       InheritException(exception,&region_image->exception);
       *image=DestroyImage(*image);
       *image=region_image;
@@ -7460,8 +7460,8 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info,
                     (void) NegateImage(image->mask,MagickFalse);
                   }
               }
-            (void) CompositeImageChannel(image,channel,image->compose,
-              composite_image,geometry.x,geometry.y);
+            (void) CompositeImage(image,image->compose,composite_image,
+              geometry.x,geometry.y);
             if (mask_image != (Image *) NULL)
               mask_image=image->mask=DestroyImage(image->mask);
             composite_image=DestroyImage(composite_image);

diff --git a/coders/msl.c b/coders/msl.c
index 46d8c6b029ab35382ff3f435f7bfa90e4655ec53..3d77fdd686a9ce7173e6467528e9e3d9bb6b3931 100644 (file)
--- a/coders/msl.c
+++ b/coders/msl.c
@@ -2053,8 +2053,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
           flags=ParseGravityGeometry(image,composite_geometry,&geometry,
             &exception);
           if (rotate_image == (Image *) NULL)
-            CompositeImageChannel(image,channel,compose,composite_image,
-              geometry.x,geometry.y);
+            CompositeImage(image,compose,composite_image,geometry.x,geometry.y);
           else
             {
               /*
@@ -2063,8 +2062,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
               geometry.x-=(ssize_t) (rotate_image->columns-
                 composite_image->columns)/2;
               geometry.y-=(ssize_t) (rotate_image->rows-composite_image->rows)/2;
-              CompositeImageChannel(image,channel,compose,rotate_image,
-                geometry.x,geometry.y);
+              CompositeImage(image,compose,rotate_image,geometry.x,geometry.y);
               rotate_image=DestroyImage(rotate_image);
             }
           composite_image=DestroyImage(composite_image);