Changeset 38340 for branches/eam_branches/ohana.20150429/src/libfits/table/F_uncompress_T.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/table/F_uncompress_T.c (modified) (2 diffs)

branches/eam_branches/ohana.20150429/src/libfits/table/F_uncompress_T.c

@@ -98 +98 @@
 
   // allocate the intermediate storage buffers
-  ALLOCATE (raw,   char, max_width*ztilelen);
+  int Nraw_alloc = max_width*ztilelen + 100;
+  ALLOCATE (raw,   char, Nraw_alloc);
   ALLOCATE (zdata, char, max_width*ztilelen);
 
@@ -120 +121 @@
     
       int Nrows = (row == Ntile - 1) ? ztilelast : ztilelen;
-      int Nraw = Nrows*fields[i].Nvalues; // number of pixels
-
+      int Nraw = Nraw_alloc; // expected number of pixel: Nrows*fields[i].Nvalues
       if (!gfits_uncompress_data (zdata, Nzdata, fields[i].zctype, NULL, NULL, 0, raw, &Nraw, fields[i].pixsize)) ESCAPE(A);