]> granicus.if.org Git - imagemagick/commitdiff
...
authorCristy <urban-warrior@imagemagick.org>
Tue, 15 Oct 2019 21:39:35 +0000 (17:39 -0400)
committerCristy <urban-warrior@imagemagick.org>
Tue, 15 Oct 2019 21:39:50 +0000 (17:39 -0400)
MagickWand/montage.c
utilities/montage.1.in

index 0e549faa0e3f72b53cdd888b884b059c03d18087..cf0f39d4f87d923f7cd2ea4a1f4a6f041c937c8c 100644 (file)
@@ -157,6 +157,7 @@ static MagickBooleanType MontageUsage(void)
       "  -interpolate method  pixel color interpolation method\n"
       "  -kerning value       set the space between two letters\n"
       "  -label string        assign a label to an image\n"
+      "  -layers method       optimize, merge, or compare image layers\n"
       "  -limit type value    pixel cache resource limit\n"
       "  -matte               store matte channel if the image has one\n"
       "  -mattecolor color    frame color\n"
@@ -602,7 +603,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
             Image
               *clone_images,
               *clone_list;
-            
+
             clone_list=CloneImageList(image,exception);
             if (k != 0)
               clone_list=CloneImageList(image_stack[k-1].image,exception);
@@ -612,7 +613,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
             if (*option == '+')
               clone_images=CloneImages(clone_list,"-1",exception);
             else
-              { 
+              {
                 i++;
                 if (i == (ssize_t) argc)
                   ThrowMontageException(OptionError,"MissingArgument",option);
@@ -1127,6 +1128,22 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
               ThrowMontageException(OptionError,"MissingArgument",option);
             break;
           }
+        if (LocaleCompare("layers",option+1) == 0)
+          {
+            ssize_t
+              type;
+
+            if (*option == '+')
+              break;
+            i++;
+            if (i == (ssize_t) argc)
+              ThrowMontageException(OptionError,"MissingArgument",option);
+            type=ParseCommandOption(MagickLayerOptions,MagickFalse,argv[i]);
+            if (type < 0)
+              ThrowMontageException(OptionError,"UnrecognizedLayerMethod",
+                argv[i]);
+            break;
+          }
         if (LocaleCompare("limit",option+1) == 0)
           {
             char
index 351279251494bd90b3d4fb96a998196ad2dc26d9..a6214b759d826bb17e9194001ff0b91b1bda266a 100644 (file)
@@ -48,6 +48,7 @@ Image Settings:
   \-interpolate method  pixel color interpolation method
   \-kerning value       set the space between two letters
   \-label string        assign a label to an image
+  \-layers method       optimize or compare image layers
   \-limit type value    pixel cache resource limit
   \-matte               store matte channel if the image has one
   \-mattecolor color    frame color