Changeset 38334 for branches/eam_branches/ohana.20150429/src/libfits/table/F_compress_T.c

Timestamp:

May 29, 2015, 5:24:53 PM (11 years ago)

Author:

eugene

Message:

table compression is internally consistent (tables can be generated and compressed)

File:

• branches/eam_branches/ohana.20150429/src/libfits/table/F_compress_T.c (modified) (3 diffs)

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

@@ -56 +56 @@
 
   TableField *fields = NULL;
-  ALLOCATE (fields, TableField, Nfields);
+  ALLOCATE_ZERO (fields, TableField, Nfields);
   for (i = 0; i < Nfields; i++) {
     snprintf (keyword, 80, "TTYPE%d", i+1);
@@ -129 +129 @@
 
     fields[i].offset = offset;
-    offset += fields[i].offset;
+    offset += fields[i].rowsize;
   }
 
   // allocate the intermediate storage buffers
+  int Nzdata_alloc = max_width*ztilelen + 100;
   ALLOCATE (raw,   char, max_width*ztilelen);
-  ALLOCATE (zdata, char, max_width*ztilelen);
+  ALLOCATE (zdata, char, Nzdata_alloc);
 
   // compress the data : copy into a tile, compress the tile, then add to the output table
@@ -153 +154 @@
       
       int Nraw = Nrows*fields[j].Nvalues; // number of pixels
-      int Nzdata = max_width*ztilelen; // available space, replaced with actual output size on compression
+      int Nzdata = Nzdata_alloc; // available space, replaced with actual output size on compression
       if (!gfits_compress_data (zdata, &Nzdata, fields[j].zctype, NULL, NULL, 0, raw, Nraw, fields[j].pixsize)) ESCAPE(A);