Changeset 38340 for branches/eam_branches/ohana.20150429/src/libfits/matrix/F_uncompress_data.c

Timestamp:

May 30, 2015, 7:59:48 PM (11 years ago)

Author:

eugene

Message:

more work on compression : cfitsio assumes gzip, not zlib (I have made uncompress general )

File:

• branches/eam_branches/ohana.20150429/src/libfits/matrix/F_uncompress_data.c (modified) (2 diffs)

branches/eam_branches/ohana.20150429/src/libfits/matrix/F_uncompress_data.c

@@ -26 +26 @@
 int gfits_uncompress (Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen);
 
+# define ESCAPE(RET) { fprintf (stderr, "gzip error in %s @ %s:%d\n", __func__, __FILE__, __LINE__); return (RET); }
+
 int gfits_uncompress_data (char *zdata, int Nzdata, char *cmptype, char **optname, char **optvalue, int Nopt, char *outdata, int *Nout, int out_pixsize) {
 
@@ -49 +51 @@
     // XXX shouldn't we validate the result : we think we know the size
     status = gfits_uncompress ((Bytef *) outdata, &tNout, (Bytef *) zdata, Nzdata);
-    if (status != Z_OK) {
-      fprintf (stderr, "error in uncompress (GZIP)\n");
-      return (FALSE);
-    }
+    if (status != Z_OK) ESCAPE(FALSE);
     *Nout = tNout / out_pixsize;