Changeset 23352 for branches/cnb_branches/cnb_branch_20090301/psLib/src/fits/psFitsHeader.c

Timestamp:

Mar 17, 2009, 12:08:50 PM (17 years ago)

Author:

beaumont

Message:

merged with head

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• psLib/src/fits/psFitsHeader.c (modified) (3 diffs)

branches/cnb_branches/cnb_branch_20090301/psLib/src/fits/psFitsHeader.c

@@ -149 +149 @@
 
 
-bool psFitsCheckSingleCompressedImagePHU(const psFits *fits, psMetadata *header)
+bool psFitsCheckCompressedImagePHU(const psFits *fits, psMetadata *header)
 {
     PS_ASSERT_FITS_NON_NULL(fits, false);
@@ -163 +163 @@
     }
 
-    if (psFitsGetSize(fits) != 2) {
-        // No second extension, or multiple extensions
+    if (psFitsGetSize(fits) == 1) {
+        // No extension present
         return false;
     }
@@ -416 +416 @@
     // Explore the potential case that this is an empty PHU, and the first extension contains the sole image,
     // which is compressed.
-    if (psFitsCheckSingleCompressedImagePHU(fits, header)) {
+    if (psFitsCheckCompressedImagePHU(fits, header)) {
         // This is really what we want, not the empty PHU
         psTrace("psLib.fits", 1,