Changeset 25227

Timestamp:

Sep 1, 2009, 2:46:09 PM (17 years ago)

Author:

Paul Price

Message:

SAVE_AND_RESTORE_COMPRESSION can't be optional --- we can't apply the
compression parameters for one image to another (least of all can we
apply the compression parameters for a variance map to a covariance
matrix).

File:

• trunk/magic/remove/src/streaksio.c (modified) (2 diffs)

trunk/magic/remove/src/streaksio.c

@@ -1224 +1224 @@
         if (SFILE_IS_IMAGE(in)) {
             // Turn off compression (code adapted from pmFPAWrite)
-#ifdef SAVE_AND_RESTORE_COMPRESSION
             int bitpix = out->fits->options ? out->fits->options->bitpix : 0; // Desired bits per pixel
             psFitsCompression *compress = psFitsCompressionGet(out->fits); // Current compression options
-#endif
             if (!psFitsSetCompression(out->fits, PS_FITS_COMPRESS_NONE, NULL, 0, 0, 0)) {
                 psError(PM_ERR_UNKNOWN, false, "failed to turn off compression for extension %d\n", extnum);
                 streaksExit("", PS_EXIT_UNKNOWN_ERROR);
             }
-#ifdef SAVE_AND_RESTORE_COMPRESSION
             if (out->fits->options) {
                 out->fits->options->bitpix = 0;
             }
-#endif
             if (!psFitsWriteImage(out->fits, in->header, in->image, 0, in->extname)) {
                 psError(PM_ERR_UNKNOWN, false, "failed to write image for extension %d\n", extnum);
                 streaksExit("", PS_EXIT_UNKNOWN_ERROR);
             }
-#ifdef SAVE_AND_RESTORE_COMPRESSION
             if (out->fits->options) {
                 out->fits->options->bitpix = bitpix;
@@ -1249 +1244 @@
                 streaksExit("", PS_EXIT_UNKNOWN_ERROR);
             }
-#endif
         } else {
             copyTable(out, in, extnum);