From: cristy <urban-warrior@git.imagemagick.org>
Date: Mon, 15 Mar 2010 12:53:40 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~9798
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f0c7823402847d223106b164c29e2c46d7c270ac;p=imagemagick

---

diff --git a/ChangeLog b/ChangeLog
index 9d53622cf..007f7d36f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2010-03-13  6.6.0-6 Cristy  <quetzlzacatenango@image...>
   * Add support for the Adobe Large Document format.
+  * Recognize -remap option for the mogrify utility.
 
 2010-03-11  6.6.0-5 Cristy  <quetzlzacatenango@image...>
   * Permit user to get virtual pixels with a region width of 0.
diff --git a/config/configure.xml b/config/configure.xml
index bb4390aa3..bd8f22088 100644
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -9,7 +9,7 @@
   <configure name="NAME" value="ImageMagick"/>
   <configure name="LIB_VERSION" value="0x660"/>
   <configure name="LIB_VERSION_NUMBER" value="6,6,0,6"/>
-  <configure name="RELEASE_DATE" value="2010-03-12"/>
+  <configure name="RELEASE_DATE" value="2010-03-15"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>
diff --git a/config/english.xml b/config/english.xml
index 774e258b8..2f6fe60b0 100644
--- a/config/english.xml
+++ b/config/english.xml
@@ -769,6 +769,9 @@
         <message name="UnrecognizedModeType">
           unrecognized mode type
         </message>
+        <message name="UnrecognizedMorphologyMethod">
+          unrecognized morphology method
+        </message>
         <message name="UnrecognizedOption">
           unrecognized option
         </message>
diff --git a/config/francais.xml b/config/francais.xml
index 7123c8b59..f8caea037 100644
--- a/config/francais.xml
+++ b/config/francais.xml
@@ -736,6 +736,9 @@
         <message name="UnrecognizedImageMode">
           mode d'image non reconnu
         </message>
+        <message name="UnrecognizedMorphologyMethod">
+          morphology method d'image non reconnu
+        </message>
         <message name="UnrecognizedImageOrientation">
           orientation d'image non reconnue
         </message>
diff --git a/configure b/configure
index 6647896e3..a2121cfae 100755
--- a/configure
+++ b/configure
@@ -1992,7 +1992,7 @@ Optional Packages:
   --without-jpeg          disable JPEG support
   --without-jp2           disable JPEG-2000 support
   --without-lcms          disable LCMS support
-  --without-lqr           disable Liquid Rescale support (experimental)
+  --without-lqr           disable Liquid Rescale support
   --without-openexr       disable OpenEXR support
   --without-png           disable PNG support
   --without-rsvg          disable RSVG support
diff --git a/libtool b/libtool
index fb9d7e460..538feaa4e 100755
--- a/libtool
+++ b/libtool
@@ -95,7 +95,7 @@ NM="/usr/bin/nm -B"
 LN_S="ln -s"
 
 # What is the maximum length of a command?
-max_cmd_len=1966080
+max_cmd_len=1572864
 
 # Object file suffix (normally "o").
 objext=o
diff --git a/magick/version.h b/magick/version.h
index 5b96eb465..69d977751 100644
--- a/magick/version.h
+++ b/magick/version.h
@@ -33,8 +33,8 @@ extern "C" {
 #define MagickLibAddendum  "-6"
 #define MagickLibInterface  3
 #define MagickLibMinInterface  3
-#define MagickReleaseDate  "2010-03-12"
-#define MagickChangeDate   "20100311"
+#define MagickReleaseDate  "2010-03-15"
+#define MagickChangeDate   "20100313"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickHomeURL  "file:///usr/local/share/doc/ImageMagick-6.6.0/index.html"
 #if (MAGICKCORE_QUANTUM_DEPTH == 8)
diff --git a/wand/mogrify.c b/wand/mogrify.c
index 236837ef8..9bf316d3d 100644
--- a/wand/mogrify.c
+++ b/wand/mogrify.c
@@ -5423,25 +5423,18 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
             op=ParseMagickOption(MagickMorphologyOptions,MagickFalse,token);
             if (op < 0)
               ThrowMogrifyException(OptionError,"UnrecognizedMorphologyMethod",
-                   token);
+                token);
             i++;
             if (i == (long) (argc-1))
               ThrowMogrifyException(OptionError,"MissingArgument",option);
             GetMagickToken(argv[i],NULL,token);
-            if ( isalpha((int)token[0]) )
+            if (isalpha((int) ((unsigned char) *token)) != 0)
               {
                 op=ParseMagickOption(MagickKernelOptions,MagickFalse,token);
                 if (op < 0)
                   ThrowMogrifyException(OptionError,"UnrecognizedKernelType",
-                       token);
+                    token);
               }
-#if 0
-  /* DO NOT ENABLE, geometry can not handle user defined kernels
-   * which include 'nan' values, though '-' are acceptable.
-   */
-            else if (IsGeometry(argv[i]) == MagickFalse)
-              ThrowMogrifyInvalidArgumentException(option,argv[i]);
-#endif
             break;
           }
         if (LocaleCompare("mosaic",option+1) == 0)
@@ -5717,6 +5710,15 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
               ThrowMogrifyInvalidArgumentException(option,argv[i]);
             break;
           }
+        if (LocaleCompare("remap",option+1) == 0)
+          {
+            if (*option == '+')
+              break;
+            i++;
+            if (i == (long) (argc-1))
+              ThrowMogrifyException(OptionError,"MissingArgument",option);
+            break;
+          }
         if (LocaleCompare("render",option+1) == 0)
           break;
         if (LocaleCompare("repage",option+1) == 0)