]> granicus.if.org Git - imagemagick/commitdiff
https://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=31938
authorCristy <urban-warrior@imagemagick.org>
Wed, 17 May 2017 01:05:26 +0000 (21:05 -0400)
committerCristy <urban-warrior@imagemagick.org>
Wed, 17 May 2017 01:05:26 +0000 (21:05 -0400)
MagickWand/compare.c
configure
utilities/compare.1.in
utilities/composite.1.in
utilities/convert.1.in
utilities/display.1.in
utilities/mogrify.1.in
utilities/montage.1.in

index 3078948329170d936bd850bad1397881d9ec32e5..030cba990fb061501fa0744857f03fa562e7a64e 100644 (file)
@@ -95,6 +95,23 @@ static MagickBooleanType CompareUsage(void)
       "-log format          format of debugging information",
       (char *) NULL
     },
+    *operators[]=
+    {
+      "-brightness-contrast geometry",
+      "                     improve brightness / contrast of the image",
+      "-distort method args",
+      "                     distort images according to given method ad args",
+      "-level value         adjust the level of image contrast",
+      "-resize geometry     resize the image",
+      "-rotate degrees      apply Paeth rotation to the image",
+      "-sigmoidal-contrast geometry",
+      "                     increase the contrast without saturating highlights or",
+      "-trim                trim image edges"
+    },
+    *sequence_operators[]=
+    {
+      "-crop geometry       cut out a rectangular region of the image"
+    },
     *settings[]=
     {
       "-alpha option        on, activate, off, deactivate, set, opaque, copy",
@@ -160,6 +177,12 @@ static MagickBooleanType CompareUsage(void)
   (void) printf("\nImage Settings:\n");
   for (p=settings; *p != (char *) NULL; p++)
     (void) printf("  %s\n",*p);
+  (void) printf("\nImage Operators:\n");
+  for (p=operators; *p != (char *) NULL; p++)
+    (void) printf("  %s\n",*p);
+  (void) printf("\nImage Sequence Operators:\n");
+  for (p=sequence_operators; *p != (char *) NULL; p++)
+    (void) printf("  %s\n",*p);
   (void) printf("\nMiscellaneous Options:\n");
   for (p=miscellaneous; *p != (char *) NULL; p++)
     (void) printf("  %s\n",*p);
@@ -351,10 +374,11 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowCompareException(OptionError,"MissingArgument",option);
-            type=ParseCommandOption(MagickAlphaChannelOptions,MagickFalse,argv[i]);
+            type=ParseCommandOption(MagickAlphaChannelOptions,MagickFalse,
+              argv[i]);
             if (type < 0)
-              ThrowCompareException(OptionError,"UnrecognizedAlphaChannelOption",
-                argv[i]);
+              ThrowCompareException(OptionError,
+                "UnrecognizedAlphaChannelOption",argv[i]);
             break;
           }
         if (LocaleCompare("authenticate",option+1) == 0)
@@ -368,6 +392,19 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info,
           }
         ThrowCompareException(OptionError,"UnrecognizedOption",option);
       }
+      case 'b':
+      {
+        if (LocaleCompare("brightness-contrast",option+1) == 0)
+          {
+            i++;
+            if (i == (ssize_t) argc)
+              ThrowCompareException(OptionError,"MissingArgument",option);
+            if (IsGeometry(argv[i]) == MagickFalse)
+              ThrowCompareInvalidArgumentException(option,argv[i]);
+            break;
+          }
+        ThrowCompareException(OptionError,"UnrecognizedOption",option);
+      }
       case 'c':
       {
         if (LocaleCompare("cache",option+1) == 0)
@@ -450,6 +487,17 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info,
           }
         if (LocaleCompare("concurrent",option+1) == 0)
           break;
+        if (LocaleCompare("crop",option+1) == 0)
+          {
+            if (*option == '+')
+              break;
+            i++;
+            if (i == (ssize_t) argc)
+              ThrowCompareException(OptionError,"MissingArgument",option);
+            if (IsGeometry(argv[i]) == MagickFalse)
+              ThrowCompareInvalidArgumentException(option,argv[i]);
+            break;
+          }
         ThrowCompareException(OptionError,"UnrecognizedOption",option)
       }
       case 'd':
@@ -533,6 +581,23 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info,
               dissimilarity_threshold=StringToDouble(argv[i],(char **) NULL);
             break;
           }
+        if (LocaleCompare("distort",option+1) == 0)
+          {
+            ssize_t
+              op;
+
+            i++;
+            if (i == (ssize_t) argc)
+              ThrowCompareException(OptionError,"MissingArgument",option);
+            op=ParseCommandOption(MagickDistortOptions,MagickFalse,argv[i]);
+            if (op < 0)
+              ThrowCompareException(OptionError,"UnrecognizedDistortMethod",
+                argv[i]);
+            i++;
+            if (i == (ssize_t) argc)
+              ThrowCompareException(OptionError,"MissingArgument",option);
+            break;
+          }
         if (LocaleCompare("duration",option+1) == 0)
           {
             if (*option == '+')
@@ -636,6 +701,15 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info,
       }
       case 'l':
       {
+        if (LocaleCompare("level",option+1) == 0)
+          {
+            i++;
+            if (i == (ssize_t) argc)
+              ThrowCompareException(OptionError,"MissingArgument",option);
+            if (IsGeometry(argv[i]) == MagickFalse)
+              ThrowCompareInvalidArgumentException(option,argv[i]);
+            break;
+          }
         if (LocaleCompare("limit",option+1) == 0)
           {
             char
@@ -793,11 +867,31 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info,
           }
         if (LocaleCompare("regard-warnings",option+1) == 0)
           break;
+        if (LocaleCompare("resize",option+1) == 0)
+          {
+            if (*option == '+')
+              break;
+            i++;
+            if (i == (ssize_t) argc)
+              ThrowCompareException(OptionError,"MissingArgument",option);
+            if (IsGeometry(argv[i]) == MagickFalse)
+              ThrowCompareInvalidArgumentException(option,argv[i]);
+            break;
+          }
         if (LocaleNCompare("respect-parentheses",option+1,17) == 0)
           {
             respect_parenthesis=(*option == '-') ? MagickTrue : MagickFalse;
             break;
           }
+        if (LocaleCompare("rotate",option+1) == 0)
+          {
+            i++;
+            if (i == (ssize_t) argc)
+              ThrowCompareException(OptionError,"MissingArgument",option);
+            if (IsGeometry(argv[i]) == MagickFalse)
+              ThrowCompareInvalidArgumentException(option,argv[i]);
+            break;
+          }
         ThrowCompareException(OptionError,"UnrecognizedOption",option)
       }
       case 's':
@@ -836,6 +930,15 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info,
               ThrowCompareException(OptionError,"MissingArgument",option);
             break;
           }
+        if (LocaleCompare("sigmoidal-contrast",option+1) == 0)
+          {
+            i++;
+            if (i == (ssize_t) argc)
+              ThrowCompareException(OptionError,"MissingArgument",option);
+            if (IsGeometry(argv[i]) == MagickFalse)
+              ThrowCompareInvalidArgumentException(option,argv[i]);
+            break;
+          }
         if (LocaleCompare("similarity-threshold",option+1) == 0)
           {
             if (*option == '+')
@@ -889,6 +992,8 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info,
               ThrowCompareException(OptionError,"MissingArgument",option);
             break;
           }
+        if (LocaleCompare("trim",option+1) == 0)
+          break;
         if (LocaleCompare("type",option+1) == 0)
           {
             ssize_t
index 76661976b8aec230b5ebcb0cf9b7d5c94f82a793..ff7576acd8d2ec0722110af2469733bb3b971258 100755 (executable)
--- a/configure
+++ b/configure
@@ -4519,7 +4519,7 @@ MAGICK_PATCHLEVEL_VERSION=7
 
 MAGICK_VERSION=7.0.5-7
 
-MAGICK_GIT_REVISION=20043:448775d:20170514
+MAGICK_GIT_REVISION=20065:a5d49d1:20170516
 
 
 # Substitute library versioning
index fc5bb772bd1a815f8a24ef061605854064646bf5..21f74b9059c8c3fa712cb2f842ea20d37cfba7b8 100644 (file)
@@ -11,7 +11,7 @@ For more information about the compare command, point your browser to file://@DO
 .SH DESCRIPTION
 Image Settings:
   \-alpha option        on, activate, off, deactivate, set, opaque, copy
-  \                     transparent, extract, background, or shape
+                        transparent, extract, background, or shape
   \-authenticate value  decrypt image with this password
   \-colorspace type     alternate image colorspace
   \-compose operator    set image composite operator
@@ -62,6 +62,21 @@ Image Settings:
   \-virtual-pixel method
                        virtual pixel access method
 
+Image Operators:
+  \-brightness-contrast geometry
+                        improve brightness / contrast of the image
+  \-distort method args
+                        distort images according to given method and args
+  \-level value         adjust the level of image contrast
+  \-resize geometry     resize the image
+  \-rotate degrees      apply Paeth rotation to the image
+  \-sigmoidal-contrast geometry
+                       lightness rescaling using sigmoidal contrast enhancement
+  \-trim                trim image edges
+
+Image Sequence Operators:
+  \-crop geometry       cut out a rectangular region of the image
+
 Miscellaneous Options:
   \-channel mask        set the image channel mask
   \-debug events        display copious debugging information
index 1e3597a64b698af409ea39f61fbd6e9e30664220..3a74221999598cace0fff5420be0ede8b319519b 100644 (file)
@@ -12,7 +12,7 @@ For more information about the composite command, point your browser to file://@
 Image Settings:
   \-affine matrix       affine transform matrix
   \-alpha option        on, activate, off, deactivate, set, opaque, copy
-  \                     transparent, extract, background, or shape
+                        transparent, extract, background, or shape
   \-authenticate value  decrypt image with this password
   \-blue-primary point  chromaticity blue primary point
   \-colorspace type     alternate image colorspace
index 56b4ad2e33b255c932f55abe730692e0a640bb4e..09ccbd28bc5579c38d397591b14d1b9a33db48b9 100644 (file)
@@ -59,10 +59,10 @@ Image Settings:
   \-intent type         type of rendering intent when managing the image color
   \-interlace type      type of image interlacing scheme
   \-interline-spacing value
-  \                     set the space between two text lines
+                        set the space between two text lines
   \-interpolate method  pixel color interpolation method
   \-interword-spacing value
-  \                     set the space between two words
+                        set the space between two words
   \-kerning value       set the space between two letters
   \-label string        assign a label to an image
   \-limit type value    pixel cache resource limit
@@ -133,7 +133,7 @@ Image Operators:
   \-blur geometry       reduce image noise and reduce detail levels
   \-border geometry     surround image with a border of color
   \-brightness-contrast geometry
-  \                     improve brightness / contrast of the image
+                        improve brightness / contrast of the image
   \-canny geometry      detect edges in the image
   \-channel mask        set the image channel mask
   \-charcoal radius     simulate a charcoal drawing
@@ -155,7 +155,7 @@ Image Operators:
   \-deskew threshold    straighten an image
   \-despeckle           reduce the speckles within an image
   \-distort method args
-  \                     distort images according to given method ad args
+                        distort images according to given method and args
   \-draw string         annotate the image with a graphic primitive
   \-edge radius         apply a filter to detect edges in the image
   \-emboss radius       emboss an image
@@ -186,7 +186,7 @@ Image Operators:
   \-layers method       optimize or compare image layers
   \-level value         adjust the level of image contrast
   \-level-colors color,color
-  \                     level image with the given colors
+                        level image with the given colors
   \-linear-stretch geometry
                        improve contrast by `stretching with saturation' the intensity range
   \-liquid-rescale geometry
@@ -243,7 +243,7 @@ Image Operators:
   \-sketch geometry     simulate a pencil sketch
   \-solarize threshold  negate all pixels above the threshold level
   \-sparse-color method args
-  \                     fill in a image based on a few color points
+                        fill in a image based on a few color points
   \-splice geometry     splice the background color into the image
   \-spread amount       displace image pixels by a random amount
   \-strip               strip image of all profiles and comments
index 0b27c8fb9280c21f55d069a43ae8d255cb9611a8..f627e86ca9e60e6ec505cd129745487b6d92c17d 100644 (file)
@@ -11,7 +11,7 @@ For more information about the display command, point your browser to file://@DO
 .SH DESCRIPTION
 Image Settings:
   \-alpha option        on, activate, off, deactivate, set, opaque, copy
-  \                     transparent, extract, background, or shape
+                        transparent, extract, background, or shape
   \-antialias           remove pixel-aliasing
   \-authenticate value  decrypt image with this password
   \-backdrop            display image centered on a backdrop
index 7dbfc39d6305395cca694cb33ca0759daffb2a5f..7cd9ad85b1f72f703392d44512fb504de110a8a8 100644 (file)
@@ -153,7 +153,7 @@ Image Operators:
   \-deskew threshold    straighten an image
   \-despeckle           reduce the speckles within an image
   \-distort method args
-                       distort images according to given method ad args
+                       distort images according to given method and args
   \-draw string         annotate the image with a graphic primitive
   \-edge radius         apply a filter to detect edges in the image
   \-emboss radius       emboss an image
index e9ad7ce6edcd7e45b968eb46963699b375a1c9db..0a82b7304bddb30bab9d6eeeb7765b7b00d63022 100644 (file)
@@ -13,7 +13,7 @@ Image Settings:
   \-adjoin              join images into a single multi-image file
   \-affine matrix       affine transform matrix
   \-alpha option        on, activate, off, deactivate, set, opaque, copy
-  \                     transparent, extract, background, or shape
+                        transparent, extract, background, or shape
   \-authenticate value  decrypt image with this password
   \-blue-primary point  chromaticity blue primary point
   \-bordercolor color   border color