]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Wed, 30 Jan 2013 19:57:08 +0000 (19:57 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Wed, 30 Jan 2013 19:57:08 +0000 (19:57 +0000)
coders/fits.c
configure.ac

index 6bc181c6a0a2099ad6c8dde75b316eec1bb7623d..f7a112b8d442eef574d8e18f6a71bc1fa6ed54ab 100644 (file)
@@ -435,8 +435,13 @@ static Image *ReadFITSImage(const ImageInfo *image_info,
     /*
       Convert FITS pixels to pixel packets.
     */
-    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=(double) QuantumRange/(fits_info.scale*(fits_info.max_data-
+        fits_info.min_data));
+    else
+      scale=(double) QuantumRange/(fits_info.scale*(fits_info.max_data-
+        fits_info.min_data)+fits_info.zero);
     for (y=(ssize_t) image->rows-1; y >= 0; y--)
     {
       q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
index 69f22f50ba68c7ce242237c8975520a3df397a4a..820380469da5c12f7efc94205b19c6cb71772622 100755 (executable)
@@ -718,7 +718,7 @@ esac
 QUANTUM_DEPTH="$with_quantum_depth"
 AC_DEFINE_UNQUOTED(QUANTUM_DEPTH_OBSOLETE_IN_H,$QUANTUM_DEPTH,[Number of bits in a pixel Quantum (8/16/32/64)])
 AC_SUBST(QUANTUM_DEPTH)dnl
-MAGICKCORE_PCFLAGS="$MAGICKCORE_PCFLAGS -DMAGICKCORE_QUANTUM_DEPTH=$QUANTUM_DEPTH"
+MAGICK_PCFLAGS="$MAGICK_PCFLAGS -DMAGICKCORE_QUANTUM_DEPTH=$QUANTUM_DEPTH"
 CFLAGS="$CFLAGS -DMAGICKCORE_QUANTUM_DEPTH=$QUANTUM_DEPTH"
 CPPFLAGS="$CPPFLAGS -DMAGICKCORE_QUANTUM_DEPTH=$QUANTUM_DEPTH"