Changeset 25027 for branches/pap/psLib/src/fits/psFits.c

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

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

branches/pap/psLib/src/fits/psFits.c

@@ -214 +214 @@
                 errorMsg = errorBuf;
 # endif
-                psError (PS_ERR_IO, true, "Failed to delete a previously-existing file: %s", errorMsg);
-                fprintf (stderr, "errno: %d, %s, %s : %lx, %lx\n", thisErrno, errorMsg, errorBuf, (long int) errorMsg, (long int) errorBuf);
+                psError(PS_ERR_IO, true, "Failed to delete a previously-existing file (%s), error %d: %s",
+                        name, thisErrno, errorMsg);
+                //fprintf(stderr, "errno: %d, %s, %s : %lx, %lx\n", thisErrno, errorMsg, errorBuf, (long int) errorMsg, (long int) errorBuf);
                 return NULL;
             }
@@ -931 +932 @@
     }
 
+    // use strncmp so that we can resolve the string valuves that cfitsio puts into headers (RICE_1 GZIP_1)
+    // into psFitsCompressionType
     if (strcmp(string, "NONE") == 0) return PS_FITS_COMPRESS_NONE;
-    if (strcmp(string, "GZIP") == 0) return PS_FITS_COMPRESS_GZIP;
-    if (strcmp(string, "RICE") == 0) return PS_FITS_COMPRESS_RICE;
-    if (strcmp(string, "HCOMPRESS") == 0) return PS_FITS_COMPRESS_HCOMPRESS;
-    if (strcmp(string, "PLIO") == 0) return PS_FITS_COMPRESS_PLIO;
+    if (strncmp(string, "GZIP", 4) == 0) return PS_FITS_COMPRESS_GZIP;
+    if (strncmp(string, "RICE", 4) == 0) return PS_FITS_COMPRESS_RICE;
+    if (strncmp(string, "HCOMPRESS", 9) == 0) return PS_FITS_COMPRESS_HCOMPRESS;
+    if (strncmp(string, "PLIO", 4) == 0) return PS_FITS_COMPRESS_PLIO;
 
     psWarning("Unable to identify compression type (%s) --- none set.", string);