Changeset 35674 for trunk/psLib

Timestamp:

Jun 18, 2013, 1:50:05 PM (13 years ago)

Author:

bills

Message:

be careful out shifting bits to cacluate bscale. Shift a long value so
that it doesn't go negative

File:

• trunk/psLib/src/fits/psFitsScale.c (modified) (4 diffs)

trunk/psLib/src/fits/psFitsScale.c

@@ -204 +204 @@
     psTrace("psLib.fits", 5, "Mean: %lf Stdev: %lf", mean, stdev);
 
-    long range = 1 << options->stdevBits;  // Range of values to carry standard deviation
+    long range = 1L << options->stdevBits;  // Range of values to carry standard deviation
     *bscale = stdev / (double) range;
 
@@ -217 +217 @@
         // Put (mean - N sigma) at the lowest possible value: predominantly positive images
         imageVal = mean - options->stdevNum * stdev;
-        diskVal = - (1 << (options->bitpix - 1));
+        // diskVal = - (1 << (options->bitpix - 1));
+        diskVal = - (1L << (options->bitpix - 1));
         break;
       case PS_FITS_SCALE_STDEV_NEGATIVE:
@@ -224 +225 @@
         // Put (mean + N sigma) at the highest possible value: predominantly negative images
         imageVal = mean + options->stdevNum * stdev;
-        diskVal = (1 << (options->bitpix - 1)) - 1;
+        diskVal = (1L << (options->bitpix - 1)) - 1;
         break;
       case PS_FITS_SCALE_STDEV_BOTH:
@@ -850 +851 @@
     }
 
-    *blank = (1 << (options->bitpix - 1)) - 1;
+    *blank = (1L << (options->bitpix - 1)) - 1;
 
     switch (options->scaling) {