...

diff --git a/MagickCore/geometry.c b/MagickCore/geometry.c
index 3a21928d96f851f47e085581ffb1bdadf3cae447..ee8fee92d37b8c9a23b8ade8a7afc1c5ae6e119d 100644 (file)
--- a/MagickCore/geometry.c
+++ b/MagickCore/geometry.c
@@ -362,7 +362,7 @@ MagickExport char *GetPageGeometry(const char *page_geometry)
       *geometry;
   } PageInfo;
 
-  static PageInfo
+  static const PageInfo
     PageSizes[] =
     {
       MagickPageSize("4x6", "288x432"),

diff --git a/utilities/magick.c b/utilities/magick.c
index 72bac7067378e8290759bb5e43a6ffce56e29627..19234182fa116903981876b384736658886c81c3 100644 (file)
--- a/utilities/magick.c
+++ b/utilities/magick.c
@@ -74,21 +74,21 @@ static int MagickMain(int argc,char **argv)
       command;
   } CommandInfo;
 
-  static CommandInfo
+  const CommandInfo
     MagickCommands[] =
     {
-      MagickCommandSize("magick", MagickImageCommand),  /* fallback command */
+      MagickCommandSize("convert", ConvertImageCommand),
       MagickCommandSize("animate", AnimateImageCommand),
       MagickCommandSize("compare", CompareImagesCommand),
       MagickCommandSize("conjure", ConjureImageCommand),
-      MagickCommandSize("convert", ConvertImageCommand),
       MagickCommandSize("display", DisplayImageCommand),
       MagickCommandSize("identify", IdentifyImageCommand),
       MagickCommandSize("import", ImportImageCommand),
       MagickCommandSize("magick-script", MagickImageCommand),
       MagickCommandSize("mogrify", MogrifyImageCommand),
       MagickCommandSize("montage", MontageImageCommand),
-      MagickCommandSize("stream", StreamImageCommand)
+      MagickCommandSize("stream", StreamImageCommand),
+      MagickCommandSize("magick", MagickImageCommand)
     };
 
   ExceptionInfo