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

Timestamp:

Jan 22, 2008, 5:08:03 PM (18 years ago)

Author:

Paul Price

Message:

Merging pap_branch_080117 onto mainline.

File:

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

trunk/psLib/src/fits/psFitsHeader.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-11-16 01:04:56 $
+ *  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-01-23 03:08:03 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -112 +112 @@
     PS_ASSERT_FITS_NON_NULL(fits, false);
 
-    if (!fits->conventions.compression) {
+    if (fits->options && !fits->options->conventions.compression) {
         // User has turned off compression conventions; doesn't want any nasty surprises
         return false;
@@ -220 +220 @@
 
     bool compressed = false;            // Is this a compressed image?
-    if (fits->conventions.compression && fits_is_compressed_image(fits->fd, &status)) {
+    if ((!fits->options || fits->options->conventions.compression) &&
+        fits_is_compressed_image(fits->fd, &status)) {
         compressed = true;
     }