Changeset 39422

Timestamp:

Mar 1, 2016, 11:39:07 AM (10 years ago)

Author:

eugene

Message:

fix format error for ZTILELEN; fix variable use (tile vs field)

Location:

branches/eam_branches/ohana.20160226/src/libfits

Files:

• include/gfits_compress.h (modified) (1 diff)
• table/F_compress_T.c (modified) (2 diffs)
• table/F_table_varlength.c (modified) (1 diff)

branches/eam_branches/ohana.20160226/src/libfits/include/gfits_compress.h

@@ +1 @@
+# include <zlib.h>
+
 /* functions defined in ricecomp.c */
 int fits_rcomp(int a[], int nx, unsigned char *c, int clen, int nblock);

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

@@ -146 +146 @@
 
   // define compression-specific keywords, update header as needed.
-  if (!gfits_modify (tgtheader, "ZTILELEN", "%lud", 1, ztilelen)) ESCAPE;
+  if (!gfits_modify (tgtheader, "ZTILELEN", "%lu", 1, ztilelen)) ESCAPE;
 
   if (!gfits_modify (tgtheader, "ZNAXIS1", OFF_T_FMT, 1, srcheader->Naxis[0])) ESCAPE;
@@ -337 +337 @@
       }
 
-      if (!gfits_varlength_column_add_data (tgttable, zdata, Nzdata, field, &fields[field].zdef)) ESCAPE;
+      if (!gfits_varlength_column_add_data (tgttable, zdata, Nzdata, tile, &fields[field].zdef)) ESCAPE;
       // XXX TIMER 2e
       gettimeofday (&stopTimer, (void *) NULL); 

branches/eam_branches/ohana.20160226/src/libfits/table/F_table_varlength.c

@@ -187 +187 @@
     ptr[0] = Ndata;
     ptr[1] = heap_offset - table->heap_start;
+    // fprintf (stderr, "row: %d, Ndata: %d, maxlen: %d, Ndata: %d, ptr1: %d\n", (int) row, (int) Ndata, (int) column->maxlen, (int) Ndata, (int) (heap_offset - table->heap_start));
   }