(no commit message)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 5406bfe4ea26ec2df4af73249583c2184a6856ae..091f73baf2bd0653a2ace97dde80b0eb87eaaf99 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2013 ImageMagick Studio LLC"
-#define MagickSVNRevision  "10994:10995M"
+#define MagickSVNRevision  "11008:11010M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  1,0,0
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  1
 #define MagickLibMinInterface  1
-#define MagickReleaseDate  "2013-02-10"
+#define MagickReleaseDate  "2013-02-12"
 #define MagickChangeDate   "20121005"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickFeatures "DPC HDRI OpenMP"

diff --git a/MagickWand/Makefile.am b/MagickWand/Makefile.am
index 8d7c535f7adcd7ee60589b9d2ef82dc734764991..8d7d13c27f37f1f9618eb432f64f5de917d2c9f3 100644 (file)
--- a/MagickWand/Makefile.am
+++ b/MagickWand/Makefile.am
@@ -55,6 +55,7 @@ MAGICKWAND_SOURCES = \
        MagickWand/montage.h \
        MagickWand/operation.c \
        MagickWand/operation.h \
+       MagickWand/operation-private.h \
        MagickWand/pixel-iterator.c \
        MagickWand/pixel-iterator.h \
        MagickWand/pixel-wand.c \
@@ -101,6 +102,7 @@ MAGICKWAND_INCLUDE_HDRS = \
 MAGICKWAND_NOINST_HDRS = \
        MagickWand/mogrify-private.h \
        MagickWand/magick-wand-private.h \
+       MagickWand/operation-private.h \
        MagickWand/pixel-wand-private.h \
        MagickWand/script-token.h \
        MagickWand/studio.h \

diff --git a/MagickWand/composite.c b/MagickWand/composite.c
index 6be8074a5938e619e13aa8de63ca00232f397149..098c33d35fd91d1d18a5540d17e7cc68bcb3a4d0 100644 (file)
--- a/MagickWand/composite.c
+++ b/MagickWand/composite.c
@@ -1622,22 +1622,12 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
     {
       if ((composite_options.compose == DisplaceCompositeOp) ||
           (composite_options.compose == DistortCompositeOp))
-        {
-          /*
-            Merge Y displacement into X displacement image.
-          */
-          (void) CompositeImage(composite_image,mask_image,CopyGreenCompositeOp,
-            MagickTrue,0,0,exception);
-          mask_image=DestroyImage(mask_image);
-        }
+        status&=CompositeImage(composite_image,mask_image,
+          CopyGreenCompositeOp,MagickTrue,0,0,exception);
       else
-        {
-          /*
-            Set a blending mask for the composition.
-          */
-          (void) NegateImage(mask_image,MagickFalse,exception);
-          (void) SetImageMask(images,mask_image,exception);
-        }
+        status&=CompositeImage(composite_image,mask_image,IntensityCompositeOp,
+          MagickTrue,0,0,exception);
+      mask_image=DestroyImage(mask_image);
     }
   status&=CompositeImageList(image_info,&images,composite_image,
     &composite_options,exception);

diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index 081dec9679cb389807d6c5afad6f1a71c4cf3b37..9965119abf8ec7bfad438899308456738379d43e 100644 (file)
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -7462,27 +7462,15 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info,
               {
                 if ((image->compose == DisplaceCompositeOp) ||
                     (image->compose == DistortCompositeOp))
-                  {
-                    /*
-                      Merge Y displacement into X displacement image.
-                    */
-                    (void) CompositeImage(composite_image,mask_image,
-                      CopyGreenCompositeOp,MagickTrue,0,0,exception);
-                    mask_image=DestroyImage(mask_image);
-                  }
+                  status&=CompositeImage(composite_image,mask_image,
+                    CopyGreenCompositeOp,MagickTrue,0,0,exception);
                 else
-                  {
-                    /*
-                      Set a blending mask for the composition.
-                    */
-                    (void) NegateImage(mask_image,MagickFalse,exception);
-                    (void) SetImageMask(composite_image,mask_image,exception);
-                    mask_image=DestroyImage(mask_image);
-                  }
+                  status&=CompositeImage(composite_image,mask_image,
+                    IntensityCompositeOp,MagickTrue,0,0,exception);
+                mask_image=DestroyImage(mask_image);
               }
             (void) CompositeImage(image,composite_image,image->compose,
               clip_to_self,geometry.x,geometry.y,exception);
-            (void) SetImageMask(image,(Image *) NULL,exception);
             composite_image=DestroyImage(composite_image);
             *images=DestroyImageList(*images);
             *images=image;

diff --git a/MagickWand/operation-private.h b/MagickWand/operation-private.h
new file mode 100644 (file)
index 0000000..49b0e44
--- /dev/null
+++ b/MagickWand/operation-private.h
@@ -0,0 +1,38 @@
+/*
+  Copyright 1999-2013 ImageMagick Studio LLC, a non-profit organization
+  dedicated to making software imaging solutions freely available.
+
+  You may not use this file except in compliance with the License.
+  obtain a copy of the License at
+
+    http://www.imagemagick.org/script/license.php
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+  MagickWand private command-line option process.
+*/
+#ifndef _MAGICKWAND_OPERATION_PRIVATE_H
+#define _MAGICKWAND_OPERATION_PRIVATE_H
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+/* These actually private */
+extern WandPrivate MagickBooleanType
+  CLIListOperatorImages(MagickCLI *, const char *,const char *,const char *);
+
+extern WandPrivate void
+  CLISettingOptionInfo(MagickCLI *,const char *,const char *, const char *),
+  CLISimpleOperatorImages(MagickCLI *,const char *,const char *,const char *),
+  CLINoImageOperator(MagickCLI *, const char *,const char *,const char *);
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
+
+#endif

diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index 3683984d8503eaf9b7b8f3d15ce189566c2a5676..4aaed8364d5a2cbf8fcfc493faceeac24a789a3e 100644 (file)
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -399,7 +399,7 @@ static Image *SparseColorOption(const Image *image,
 %        arg2 is currently only used by "-limit"
 %
 */
-WandExport void CLISettingOptionInfo(MagickCLI *cli_wand,
+WandPrivate void CLISettingOptionInfo(MagickCLI *cli_wand,
      const char *option,const char *arg1, const char *arg2)
 {
   ssize_t
@@ -1641,7 +1641,7 @@ interpret Percent Escapes in Arguments, At least not yet */
   also change.  GetFirstImageInList() should be used by caller if they wish
   return the Image pointer to the first image in list.
 */
-static void CLISimpleOperatorImage(MagickCLI *cli_wand,
+static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand,
   const char *option, const char *arg1n, const char *arg2n)
 {
   Image *
@@ -3401,7 +3401,7 @@ static void CLISimpleOperatorImage(MagickCLI *cli_wand,
   if (new_image != (Image *) NULL)
     ReplaceImageInListReturnLast(&_image,new_image);
 
-  return;
+  return(MagickTrue);
 #undef _image_info
 #undef _draw_info
 #undef _quantize_info
@@ -3413,8 +3413,8 @@ static void CLISimpleOperatorImage(MagickCLI *cli_wand,
 #undef plus_alt_op
 }
 
-WandExport void CLISimpleOperatorImages(MagickCLI *cli_wand,
-  const char *option, const char *arg1, const char *arg2)
+WandPrivate MagickBooleanType CLISimpleOperatorImages(MagickCLI *cli_wand,
+  const char *option,const char *arg1,const char *arg2)
 {
 #if !USE_WAND_METHODS
   size_t
@@ -3449,7 +3449,7 @@ WandExport void CLISimpleOperatorImages(MagickCLI *cli_wand,
     CLISimpleOperatorImage(cli_wand, option, arg1, arg2);
   MagickResetIterator(&cli_wand->wand);
 #endif
-  return;
+  return(MagickTrue);
 }
 \f
 /*
@@ -3470,8 +3470,8 @@ WandExport void CLISimpleOperatorImages(MagickCLI *cli_wand,
 %
 %  The format of the MogrifyImage method is:
 %
-%    void CLIListOperatorImages(MagickCLI *cli_wand,
-%        const char *option, const char *arg1, const char *arg2)
+%    MagickBooleanType CLIListOperatorImages(MagickCLI *cli_wand,
+%      const char *option,const char *arg1,const char *arg2)
 %
 %  A description of each parameter follows:
 %
@@ -3483,9 +3483,12 @@ WandExport void CLISimpleOperatorImages(MagickCLI *cli_wand,
 %        arg2 is currently not used
 %
 */
-WandExport void CLIListOperatorImages(MagickCLI *cli_wand,
-     const char *option,const char *arg1n, const char *arg2n)
+WandPrivate MagickBooleanType CLIListOperatorImages(MagickCLI *cli_wand,
+  const char *option,const char *arg1n,const char *arg2n)
 {
+  MagickBooleanType
+    status;
+
   ssize_t
     parse;
 
@@ -3544,7 +3547,7 @@ WandExport void CLIListOperatorImages(MagickCLI *cli_wand,
     "CLIListOperatorImages: \"%s\" \"%s\" \"%s\"\n",option,arg1,arg2);
 #endif
 
-
+  status=MagickTrue;
   new_images=NewImageList();
 
   switch (*(option+1))
@@ -3648,32 +3651,24 @@ WandExport void CLIListOperatorImages(MagickCLI *cli_wand,
           /* FUTURE - this should not be here! - should be part of -geometry */
           (void) TransformImage(&source_image,(char *) NULL,
             source_image->geometry,_exception);
-
           SetGeometry(source_image,&geometry);
           (void) ParseAbsoluteGeometry(source_image->geometry,&geometry);
           GravityAdjustGeometry(new_images->columns,new_images->rows,
-               new_images->gravity, &geometry);
-
+            new_images->gravity, &geometry);
           mask_image=RemoveFirstImageFromList(&_images);
           if (mask_image != (Image *) NULL)
-            { /* handle a third write mask image */
+            {
               if ((compose == DisplaceCompositeOp) ||
-                  (compose == DistortCompositeOp)) {
-                /* Merge Y displacement into X displace/distort map. */
-                (void) CompositeImage(source_image,mask_image,
+                  (compose == DistortCompositeOp))
+                status&=CompositeImage(source_image,mask_image,
                   CopyGreenCompositeOp,MagickTrue,0,0,_exception);
-                mask_image=DestroyImage(mask_image);
-              }
-              else {
-                /* Set a blending mask for the composition.  */
-                (void) NegateImage(mask_image,MagickFalse,_exception);
-                (void) SetImageMask(source_image,mask_image,_exception);
-                mask_image=DestroyImage(mask_image);
-              }
+              else
+                status&=CompositeImage(source_image,mask_image,
+                  IntensityCompositeOp,MagickTrue,0,0,_exception);
+              mask_image=DestroyImage(mask_image);
             }
-          (void) CompositeImage(new_images,source_image,compose,clip_to_self,
+          status&=CompositeImage(new_images,source_image,compose,clip_to_self,
             geometry.x,geometry.y,_exception);
-          (void) SetImageMask(new_images,(Image *) NULL,_exception);
           source_image=DestroyImage(source_image);
           break;
         }
@@ -4241,10 +4236,10 @@ WandExport void CLIListOperatorImages(MagickCLI *cli_wand,
 
   /* if new image list generated, replace existing image list */
   if (new_images == (Image *) NULL)
-    return;
+    return(status);
   _images=DestroyImageList(_images);
   _images=GetFirstImageInList(new_images);
-  return;
+  return(status);
 
 #undef _image_info
 #undef _images
@@ -4292,8 +4287,8 @@ WandExport void CLIListOperatorImages(MagickCLI *cli_wand,
 %                   Currently arg2 is not used.
 %
 */
-WandExport void CLINoImageOperator(MagickCLI *cli_wand,
-  const char *option, const char *arg1, const char *arg2)
+WandPrivate void CLINoImageOperator(MagickCLI *cli_wand,
+  const char *option,const char *arg1,const char *arg2)
 {
 #if 0
   const char    /* For percent escape interpretImageProperties() */

diff --git a/MagickWand/operation.h b/MagickWand/operation.h
index b10a47cd80b7ead31efca0018ce434fae46f3f92..4b0ccfad3f088d9531803785ad03ac7533dabbf3 100644 (file)
--- a/MagickWand/operation.h
+++ b/MagickWand/operation.h
@@ -22,14 +22,6 @@
 extern "C" {
 #endif
 
-/* These actually private */
-extern WandExport void
-  CLISettingOptionInfo(MagickCLI *,const char *,const char *, const char *),
-  CLISimpleOperatorImages(MagickCLI *,const char *,const char *,const char *),
-  CLIListOperatorImages(MagickCLI *, const char *,const char *,const char *),
-  CLINoImageOperator(MagickCLI *, const char *,const char *,const char *);
-
-/* This can be used by used using WandCLI API */
 extern WandExport void
   CLIOption(MagickCLI *,const char *,...);
 

diff --git a/Makefile.in b/Makefile.in
index 0f06561aa6f21738d3b9cd8a492f23ceef0ff7ce..0d18f059a0d8e503ef01ce04a7b399c34bbb07de 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -4502,6 +4502,7 @@ MAGICKWAND_SOURCES = \
        MagickWand/montage.h \
        MagickWand/operation.c \
        MagickWand/operation.h \
+       MagickWand/operation-private.h \
        MagickWand/pixel-iterator.c \
        MagickWand/pixel-iterator.h \
        MagickWand/pixel-wand.c \
@@ -4548,6 +4549,7 @@ MAGICKWAND_INCLUDE_HDRS = \
 MAGICKWAND_NOINST_HDRS = \
        MagickWand/mogrify-private.h \
        MagickWand/magick-wand-private.h \
+       MagickWand/operation-private.h \
        MagickWand/pixel-wand-private.h \
        MagickWand/script-token.h \
        MagickWand/studio.h \

diff --git a/configure b/configure
index 58aadd9e4cdbf191422d2ea19baac088747339dc..9e981d52f8f8b3a9ef9ef18e6a1c392a341b78a6 100755 (executable)
--- a/configure
+++ b/configure
@@ -3668,7 +3668,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=10994:10995M
+MAGICK_SVN_REVISION=11008:11010M
 
 
 # Substitute library versioning