Changeset 19872 for trunk/psLib/src/fits/psFitsHeader.c

Timestamp:

Oct 2, 2008, 3:43:43 PM (18 years ago)

Author:

Paul Price

Message:

Was writing compressed-translated versions of some headers when we weren't writing compressed files.

File:

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

trunk/psLib/src/fits/psFitsHeader.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-08-02 02:50:41 $
+ *  @version $Revision: 1.48 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-10-03 01:43:43 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -80 +80 @@
                                                     { "ZEXTEND",  "EXTEND" },
                                                     { "ZBLOCKED", "BLOCKED"},
-                                                    //                                                    { "ZPCOUNT",  "PCOUNT" },
-                                                    //                                                    { "ZGCOUNT",  "GCOUNT" },
                                                     { "ZHECKSUM", "CHECKSUM"},
                                                     { "ZDATASUM", "DATASUM" },
@@ -522 +520 @@
         }
     }
-    if ((!fits->options || fits->options->conventions.compression) && compress != PS_FITS_COMPRESS_NONE) {
+
+    bool compressing = ((!fits->options || fits->options->conventions.compression) &&
+                        compress != PS_FITS_COMPRESS_NONE) ? true : false; // Are we compressing?
+
+    if (compressing) {
         psMetadataItem *simpleItem = psMetadataLookup(output, "SIMPLE"); // SIMPLE in the header
         if (simpleItem) {
@@ -556 +558 @@
 
             // Options for compression
-            if (!fits->options || fits->options->conventions.compression) {
+            if (compressing) {
                 // Check to see if the keyword should be translated
                 name = (char*)keywordUntranslate(name, compressTranslation); // Casting away const for cfitsio