Changeset 38335

Timestamp:

May 29, 2015, 5:45:02 PM (11 years ago)

Author:

eugene

Message:

add image compression test; updates to API

Location:

branches/eam_branches/ohana.20150429/src/libfits

Files:

• Makefile (modified) (1 diff)
• include/gfitsio.h (modified) (1 diff)
• table/F_uncompress_T.c (modified) (1 diff)
• test/imagecomp.c (added)
• test/tablecomp.c (modified) (1 diff)

branches/eam_branches/ohana.20150429/src/libfits/Makefile

@@ -26 +26 @@
 TEST_LDFLAGS  = $(BASE_LDFLAGS) -lFITS -lohana -ltap_ohana
 
-TESTPROG = tablecomp zlib
+TESTPROG = imagecomp tablecomp zlib
 $(TESTPROG) : % : $(TESTBIN)/%
 test: $(TESTPROG)

branches/eam_branches/ohana.20150429/src/libfits/include/gfitsio.h

@@ -268 +268 @@
 
 int     gfits_compress_table           PROTO((FTable *srctable, FTable *tgttable, int ztilelen, char *zcmptype));
+int     gfits_uncompress_table         PROTO((FTable *srctable, FTable *tgttable));
 
 #endif /* FITSIO */

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

@@ -7 +7 @@
 int gfits_distribute_table_data (FTable *table, char *raw, int col, int row_start, int Nrows, int rowsize);
 
-int gfits_uncompress_table (FTable *srctable, FTable *tgttable, char *zcmptype) {
+int gfits_uncompress_table (FTable *srctable, FTable *tgttable) {
 
   int i;

branches/eam_branches/ohana.20150429/src/libfits/test/tablecomp.c

@@ -69 +69 @@
     FTable rawtable;
     rawtable.header = &rawheader;
-    ok (gfits_uncompress_table (&cmptable, &rawtable, 10, zcmptype), "uncompressed table");
+    ok (gfits_uncompress_table (&cmptable, &rawtable), "uncompressed table");
     
     gfits_free_header (&cmpheader);