Changeset 18869

Timestamp:

Aug 1, 2008, 4:50:41 PM (18 years ago)

Author:

Paul Price

Message:

Don't write header keywords particular to compressed images in ordinary uncompressed images.

Location:

trunk/psLib/src/fits

Files:

• psFitsHeader.c (modified) (4 diffs)
• psFitsImage.c (modified) (2 diffs)

trunk/psLib/src/fits/psFitsHeader.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.46 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-07-04 03:18:06 $
+ *  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-08-02 02:50:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -47 +47 @@
 // List of FITS header keys not to write (handled by cfitsio); NULL-terminated
 static const char *noWriteFitsKeys[] = { "SIMPLE", "XTENSION", "BITPIX", "NAXIS", "EXTNAME", "BSCALE",
-                                         "BZERO", "TFIELDS", "PCOUNT", "GCOUNT", "PSBITPIX", NULL };
+                                         "BZERO", "TFIELDS", "PCOUNT", "GCOUNT", "PSBITPIX", "BLANK", NULL };
 
 // List of the start of FITS header keys not to write (handled by cfitsio); NULL-terminated
@@ -53 +53 @@
 
 // List of compressed FITS header keys not to write (handled by cfitsio); NULL-terminated
-static const char *noWriteCompressedKeys[] = { "ZBITPIX", "ZIMAGE", "ZBITPIX", "ZCMPTYPE", NULL };
+static const char *noWriteCompressedKeys[] = { "ZBITPIX", "ZIMAGE", "ZBITPIX", "ZCMPTYPE", "ZSIMPLE",
+                                               "ZEXTEND", "ZBLANK", NULL };
 
 // List of the start of FITS header keys not to write (handled by cfitsio); NULL-terminated
@@ -555 +556 @@
 
             // Options for compression
-            if (compress != PS_FITS_COMPRESS_NONE &&
-                (!fits->options || fits->options->conventions.compression)) {
+            if (!fits->options || fits->options->conventions.compression) {
                 // Check to see if the keyword should be translated
                 name = (char*)keywordUntranslate(name, compressTranslation); // Casting away const for cfitsio

trunk/psLib/src/fits/psFitsImage.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-07-17 03:34:22 $
+ *  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-08-02 02:50:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -623 +623 @@
     }
 
-    if (blank != 0) {
+    if (blank != 0 && bitPix > 0) {
         // Some quantisation has taken place --- record the blank ("magic") pixel value
         char *keyword = (psFitsCompressionGetType(fits) != PS_FITS_COMPRESS_NONE &&