(no commit message)

diff --git a/MagickWand/magick-cli.c b/MagickWand/magick-cli.c
index f3cbf817eebaba6c6089a740df06f4d1a354c05b..1cc641b7758357983b34e11c0f6df3acc3ad9dc1 100644 (file)
--- a/MagickWand/magick-cli.c
+++ b/MagickWand/magick-cli.c
@@ -530,20 +530,20 @@ WandExport int ProcessCommandOptions(MagickCLI *cli_wand, int argc,
 %
 %  The format of the MagickImageCommand method is:
 %
-%      MagickBooleanType MagickImageCommand(ImageInfo *image_info,
-%           int argc, char **argv, char **metadata, ExceptionInfo *exception)
+%      MagickBooleanType MagickImageCommand(ImageInfo *image_info,int argc,
+%        char **argv,char **metadata,ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
 %
 %    o image_info: the starting image_info structure
-%         (for compatibilty with MagickCommandGenisis())
+%      (for compatibilty with MagickCommandGenisis())
 %
 %    o argc: the number of elements in the argument vector.
 %
 %    o argv: A text array containing the command line arguments.
 %
 %    o metadata: any metadata (for VBS) is returned here.
-%         (for compatibilty with MagickCommandGenisis())
+%      (for compatibilty with MagickCommandGenisis())
 %
 %    o exception: return any errors or warnings in this structure.
 %
@@ -563,26 +563,26 @@ static void MagickUsage(MagickBooleanType verbose)
   if (len>=7 && LocaleCompare("convert",name+len-7) == 0) {
     /* convert usage */
     (void) FormatLocaleFile(stdout,
-       "Usage: %s [{option}|{image}...] {output_image}\n",name);
+       "Usage: %s [ {option} | {image} ... ] {output_image}\n",name);
     (void) FormatLocaleFile(stdout,
-       "       %s -help|-version|-usage|-list {option}\n\n",name);
+       "       %s -help | -version | -usage | -list {option}\n\n",name);
     return;
   }
   else if (len>=6 && LocaleCompare("script",name+len-6) == 0) {
     /* magick-script usage */
     (void) FormatLocaleFile(stdout,
-       "Usage: %s {filename} [{script_args}...]\n",name);
+      "Usage: %s {filename} [ {script_args} ... ]\n",name);
   }
   else {
     /* magick usage */
     (void) FormatLocaleFile(stdout,
-       "Usage: %s [{option}|{image}...] {output_image}\n",name);
+       "Usage: %s [ {option} | {image} ... ] {output_image}\n",name);
     (void) FormatLocaleFile(stdout,
-       "       %s [{option}|{image}...] -script {filename} [{script_args}...]\n",
+       "       %s [ {option} | {image} ... ] -script {filename} [ {script_args} ...]\n",
        name);
   }
   (void) FormatLocaleFile(stdout,
-       "       %s -help|-version|-usage|-list {option}\n\n",name);
+    "       %s -help | -version | -usage | -list {option}\n\n",name);
 
   if (IfMagickFalse(verbose))
     return;
@@ -774,10 +774,10 @@ Magick_Command_Cleanup:
     format="%w,%h,%m";   // Get this from image_info Option splaytree
 
     text=InterpretImageProperties(image_info,cli_wand->wand.images,format,
-         exception);
+      exception);
     if (text == (char *) NULL)
       ThrowMagickException(exception,GetMagickModule(),ResourceLimitError,
-           "MemoryAllocationFailed","`%s'", GetExceptionMessage(errno));
+        "MemoryAllocationFailed","`%s'", GetExceptionMessage(errno));
     else {
       (void) ConcatenateString(&(*metadata),text);
       text=DestroyString(text);

diff --git a/coders/fits.c b/coders/fits.c
index 7e1de7abed7cbc7975350e7f45afa0456f3ace86..6bc181c6a0a2099ad6c8dde75b316eec1bb7623d 100644 (file)
--- a/coders/fits.c
+++ b/coders/fits.c
@@ -437,8 +437,6 @@ static Image *ReadFITSImage(const ImageInfo *image_info,
     */
     scale=(double) QuantumRange/(fits_info.scale*(fits_info.max_data-
       fits_info.min_data)+fits_info.zero);
-    if ((image->depth == 16) || (image->depth == 32) || (image->depth == 64))
-      scale=1.0;
     for (y=(ssize_t) image->rows-1; y >= 0; y--)
     {
       q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
@@ -690,7 +688,7 @@ static MagickBooleanType WriteFITSImage(const ImageInfo *image_info,
   (void) strncpy(fits_info+offset,header,strlen(header));
   offset+=80;
   (void) FormatLocaleString(header,FITSBlocksize,"BZERO   =         %E",
-    image->depth > 8 ? GetFITSPixelRange(image->depth) : 0.0);
+    image->depth > 8 ? GetFITSPixelRange(image->depth)/2.0 : 0.0);
   (void) strncpy(fits_info+offset,header,strlen(header));
   offset+=80;
   (void) FormatLocaleString(header,FITSBlocksize,"DATAMAX =         %E",