Changeset 23351 for branches/cnb_branches/cnb_branch_20090301/psModules/src/camera/pmFPAWrite.c

Timestamp:

Mar 17, 2009, 12:07:42 PM (17 years ago)

Author:

beaumont

Message:

merged with head

Location:

branches/cnb_branches/cnb_branch_20090301/psModules

Files:

• . (modified) (1 prop)
• src/camera/pmFPAWrite.c (modified) (3 diffs)

branches/cnb_branches/cnb_branch_20090301/psModules/src/camera/pmFPAWrite.c

@@ -692 +692 @@
                      "Centre of covariance matrix in y", -yMinCovar);
 
+    // Turn off compression
+    int bitpix = fits->options ? fits->options->bitpix : 0; // Desired bits per pixel
+    psFitsCompression *compress = psFitsCompressionGet(fits); // Current compression options
+    if (!psFitsSetCompression(fits, PS_FITS_COMPRESS_NONE, NULL, 0, 0, 0)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to set FITS compression to NONE");
+        psFree(extname);
+        psFree(header);
+        psFree(images);
+        psFree(compress);
+        return false;
+    }
+    if (fits->options) {
+        fits->options->bitpix = 0;
+    }
+
     // Write images
     if (!psFitsWriteImageCube(fits, header, images, extname)) {
@@ -699 +714 @@
         psFree(header);
         psFree(images);
+        if (fits->options) {
+            fits->options->bitpix = bitpix;
+        }
+        psFitsCompressionApply(fits, compress);
+        psFree(compress);
         return 0;
     }
@@ -704 +724 @@
     psFree(header);
     psFree(images);
+
+    // Restore compression
+    if (fits->options) {
+        fits->options->bitpix = bitpix;
+    }
+    if (!psFitsCompressionApply(fits, compress)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to set FITS compression to NONE");
+        psFree(compress);
+        return false;
+    }
+    psFree(compress);
 
     return true;