Changeset 24285 for trunk/psLib/src/fits/psFits.c

Timestamp:

Jun 1, 2009, 11:42:15 AM (17 years ago)

Author:

bills

Message:

In psFitsCompressionTypeFromString allow matches where the beginning
of the string matches. So RICE_1 matches RICE, GZIP_1 matches GZIP.
This allows comparison to the values that cfitsio puts into headers

File:

• trunk/psLib/src/fits/psFits.c (modified) (1 diff)

trunk/psLib/src/fits/psFits.c

@@ -931 +931 @@
     }
 
+    // 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);