(no commit message)

diff --git a/magick/image.c b/magick/image.c
index 0317b2078a1f79d46ed3160b46e8356d06280f7d..9845f85bb4c5bdb62ed3ad122744156e4b9e82e9 100644 (file)
--- a/magick/image.c
+++ b/magick/image.c
@@ -726,6 +726,7 @@ MagickExport MagickBooleanType ClipImagePath(Image *image,const char *pathname,
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %  CloneImage() copies an image and returns the copy as a new image object.
+%
 %  If the specified columns and rows is 0, an exact copy of the image is
 %  returned, otherwise the pixel data is undefined and must be initialized
 %  with the QueueAuthenticPixels() and SyncAuthenticPixels() methods.  On

diff --git a/magick/option.c b/magick/option.c
index af1f284c71af77e5fe89e26cb54ad78cb5f7e3cf..e94305f082ac71cf1aecd26141f79f117f5f8090 100644 (file)
--- a/magick/option.c
+++ b/magick/option.c
@@ -723,7 +723,6 @@ static const OptionInfo
     { "CopyRed", (ssize_t) CopyRedCompositeOp, MagickFalse },
     { "CopyYellow", (ssize_t) CopyYellowCompositeOp, MagickFalse },
     { "Darken", (ssize_t) DarkenCompositeOp, MagickFalse },
-    { "Divide", (ssize_t) DivideDstCompositeOp, MagickFalse },
     { "DivideDst", (ssize_t) DivideDstCompositeOp, MagickFalse },
     { "DivideSrc", (ssize_t) DivideSrcCompositeOp, MagickFalse },
     { "Dst", (ssize_t) DstCompositeOp, MagickFalse },
@@ -746,7 +745,6 @@ static const OptionInfo
     { "LinearLight", (ssize_t) LinearLightCompositeOp, MagickFalse },
     { "Luminize", (ssize_t) LuminizeCompositeOp, MagickFalse },
     { "Mathematics", (ssize_t) MathematicsCompositeOp, MagickFalse },
-    { "Minus", (ssize_t) MinusDstCompositeOp, MagickFalse },
     { "MinusDst", (ssize_t) MinusDstCompositeOp, MagickFalse },
     { "MinusSrc", (ssize_t) MinusSrcCompositeOp, MagickFalse },
     { "Modulate", (ssize_t) ModulateCompositeOp, MagickFalse },
@@ -773,6 +771,8 @@ static const OptionInfo
     { "VividLight", (ssize_t) VividLightCompositeOp, MagickFalse },
     { "Xor", (ssize_t) XorCompositeOp, MagickFalse },
     { "Add", (ssize_t) AddCompositeOp, MagickTrue }, /* deprecate */
+    { "Divide", (ssize_t) DivideDstCompositeOp, MagickTrue }, /* deprecate */
+    { "Minus", (ssize_t) MinusDstCompositeOp, MagickTrue }, /* deprecate */
     { "Subtract", (ssize_t) SubtractCompositeOp, MagickTrue }, /* deprecate */
     { "Threshold", (ssize_t) ThresholdCompositeOp, MagickTrue }, /* deprecate */
     { (char *) NULL, (ssize_t) UndefinedCompositeOp, MagickFalse }