Changeset 38355 for branches/eam_branches/ohana.20150429/src/libfits/include/gfitsio.h

Timestamp:

Jun 3, 2015, 4:10:26 AM (11 years ago)

Author:

eugene

Message:

clarify image vs compression buffer vs compressed pixel sizes to allow hcompress and rice

File:

• branches/eam_branches/ohana.20150429/src/libfits/include/gfitsio.h (modified) (2 diffs)

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

@@ -192 +192 @@
 int     gfits_uncompress_image         PROTO((Header *header, Matrix *matrix, FTable *ftable));
 int     gfits_uncompress_data          PROTO((char *zdata, int Nzdata, char *cmptype, char **optname, char **optvalue, int Nopt, char *outdata, int *Nout, int out_pixsize));
-int     gfits_distribute_data          PROTO((Matrix *matrix, int bitpix, char *data, int Ndata, int *otile, int oblank, int *ztile, int zblank, float zscale, float zzero));
-
-int     gfits_compress_data            PROTO((char *zdata, int *Nzdata, char *cmptype, char **optname, char **optvalue, int Nopt, char *rawdata, int Nraw, int raw_pixsize));
+int     gfits_distribute_data          PROTO((Matrix *matrix, char *data, int Ndata, int bitpix, int *otile, int oblank, int *ztile, int zblank, float zscale, float zzero));
+
+int     gfits_compress_data            PROTO((char *zdata, int *Nzdata, char *cmptype, char **optname, char **optvalue, int Nopt, char *rawdata, int Nraw, int raw_pixsize, int Nx, int Ny));
 int     gfits_compress_image           PROTO((Header *header, Matrix *matrix, FTable *ftable, int *Ztile, char *zcmptype));
 int     gfits_collect_data             PROTO((Matrix *matrix, char *raw, int Nraw, int raw_pixsize, int *otile, int oblank, int *ztile, int zblank, float zscale, float zzero));
@@ -205 +205 @@
 int     gfits_imtile_next              PROTO((Matrix *matrix, int *ztile, int *ntile, int *otile));
 
-int     gfits_byteswap_zdata           PROTO((char *zdata, int Nzdata, int bitpix));
 int     gfits_extension_is_compressed_image  PROTO((Header *header));
 int     gfits_extension_is_compressed_table  PROTO((Header *header));
+int     gfits_byteswap_zdata            PROTO((char *zdata, int Nzdata, int pixsize));
+int     gfits_compressed_data_pixsize   PROTO((char *cmptype, int out_bitpix, char **optname, char **optvalue, int Noptions));
 int     gfits_uncompressed_data_pixsize PROTO((char *cmptype, int out_bitpix, char **optname, char **optvalue, int Noptions));
-int     gfits_vartable_heap_pixsize    PROTO((char format));
+int     gfits_uncompressed_data_bitpix  PROTO((char *cmptype, int out_bitpix, char **optname, char **optvalue, int Noptions));
+int     gfits_vartable_heap_pixsize     PROTO((char format));
 
 int     gfits_varlength_column_add_data PROTO((FTable *table, char *data, off_t Ndata, int row, VarLengthColumn *column));