Changeset 15177 for branches/pap_branch_070920/psLib/src/fits/psFitsHeader.c

Timestamp:

Oct 3, 2007, 10:57:13 AM (19 years ago)

Author:

Paul Price

Message:

Renaming psFits.compConvention to psFits.conventions.compression --- there will be more than one convention (will soon add the 16-bit floats), so it makes sense to bundle them together.

File:

• branches/pap_branch_070920/psLib/src/fits/psFitsHeader.c (modified) (3 diffs)

branches/pap_branch_070920/psLib/src/fits/psFitsHeader.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.34.4.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-10-03 20:16:49 $
+ *  @version $Revision: 1.34.4.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-10-03 20:57:13 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -72 +72 @@
     PS_ASSERT_FITS_NON_NULL(fits, false);
 
-    if (!fits->compConvention) {
+    if (!fits->conventions.compression) {
         // User has turned off compression conventions; doesn't want any nasty surprises
         return false;
@@ -250 +250 @@
             } else if (strcasecmp(keyValueFixed, "-INF") == 0) {
                 success = psMetadataAddF32(header, PS_LIST_TAIL, keyName, dupFlag, keyComment, -INFINITY);
-            } else if (!fits->compConvention ||
+            } else if (!fits->conventions.compression ||
                        (strcmp(keyName, "EXTNAME") != 0 || strcmp(keyValueFixed, "COMPRESSED_IMAGE") != 0)) {
                 // Ignore EXTNAME=COMPRESSED_IMAGE if compression convention is to be respected