Changeset 27517 for branches/eam_branches/20100225/psLib/src/fits/psFitsHeader.c

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

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

branches/eam_branches/20100225/psLib/src/fits/psFitsHeader.c

@@ -570 +570 @@
             // to preserve NAXISn etc for reference, so we don't do this.
 
+            if (keywordInList(name, noWriteFitsKeys) ||
+                (keyStarts && keywordStartsWith(name, noWriteFitsKeyStarts))) {
+                psTrace("psLib.fits", 3, "Not writing FITS keyword %s", name);
+                continue;
+            }
+
             // Options for compression
             if (compressing) {
@@ -582 +588 @@
             } else if (keywordInList(name, noWriteCompressedKeys) ||
                        (keyStarts && keywordStartsWith(name, noWriteCompressedKeyStarts))) {
-                psTrace("psLib.fits", 3, "Not writing FITS keyword %s", name);
-                continue;
-            }
-
-            if (keywordInList(name, noWriteFitsKeys) ||
-                (keyStarts && keywordStartsWith(name, noWriteFitsKeyStarts))) {
                 psTrace("psLib.fits", 3, "Not writing FITS keyword %s", name);
                 continue;