Changeset 31663 for trunk/Ohana/src/libfits

Timestamp:

Jun 22, 2011, 12:33:45 AM (15 years ago)

Author:

eugene

Message:

merged from eam_branches/ipp-20110505: allow managed memory (with linked list a la psLib); add csv to mana; allow read-only dvo databases

Location:

trunk/Ohana/src/libfits

Files:

• Makefile (modified) (1 diff)
• include/gfitsio.h (modified) (2 diffs)
• matrix/F_copy_M.c (modified) (1 diff)
• table/F_copy_T.c (copied) (copied from branches/eam_branches/ipp-20110505/Ohana/src/libfits/table/F_copy_T.c )

trunk/Ohana/src/libfits/Makefile

@@ -54 +54 @@
 $(TABL)/F_set_column.$(ARCH).o                  $(TABL)/F_get_column.$(ARCH).o   \
 $(TABL)/F_table_row.$(ARCH).o                   $(TABL)/F_free_T.$(ARCH).o       \
-$(TABL)/F_table_varlength.$(ARCH).o
+$(TABL)/F_table_varlength.$(ARCH).o             $(TABL)/F_copy_T.$(ARCH).o
 
 EXTERN_OBJ = \

trunk/Ohana/src/libfits/include/gfitsio.h

@@ -63 +63 @@
   Header                 *header;
   char                   *buffer;
-  off_t                   datasize;
-  off_t                   validsize;
+  off_t                   datasize; // size of the buffer (including block padding at the end)
+  off_t                   validsize;  // size of the valid portion of the table (< validsize if file is short)
 } FTable;
 
@@ -199 +199 @@
 int     gfits_vtable_from_ftable       PROTO((FTable *ftable, VTable *vtable, off_t *row, off_t Nrow));
 int     gfits_write_table              PROTO((char *filename, FTable *ftable)); 
+int     gfits_copy_ftable              PROTO((FTable *in, FTable *out));
+int     gfits_copy_vtable              PROTO((VTable *in, VTable *out));
 
 int     gfits_create_Theader           PROTO((Header *header, char *type));

trunk/Ohana/src/libfits/matrix/F_copy_M.c

@@ -3 +3 @@
 
 /*********************** fits copy header ***********************************/
-int gfits_copy_matrix (Matrix *matrix1, Matrix *matrix2) {
+int gfits_copy_matrix (Matrix *in, Matrix *out) {
 
   int i;
 
-  matrix2[0].unsign   = matrix1[0].unsign;
-  matrix2[0].bitpix   = matrix1[0].bitpix;
-  matrix2[0].datasize = matrix1[0].datasize;
-  matrix2[0].bzero    = matrix1[0].bzero;
-  matrix2[0].bscale   = matrix1[0].bscale;
-  matrix2[0].Naxes    = matrix1[0].Naxes;
+  out[0].unsign   = in[0].unsign;
+  out[0].bitpix   = in[0].bitpix;
+  out[0].datasize = in[0].datasize;
+  out[0].bzero    = in[0].bzero;
+  out[0].bscale   = in[0].bscale;
+  out[0].Naxes    = in[0].Naxes;
   for (i = 0; i < FT_MAX_NAXES; i++) 
-    matrix2[0].Naxis[i] = matrix1[0].Naxis[i];
+    out[0].Naxis[i] = in[0].Naxis[i];
 
-  if (matrix2[0].buffer != NULL) free (matrix2[0].buffer);
-  ALLOCATE (matrix2[0].buffer, char, matrix2[0].datasize);
+  if (out[0].buffer != NULL) free (out[0].buffer);
+  ALLOCATE (out[0].buffer, char, out[0].datasize);
   
-  memcpy (matrix2[0].buffer, matrix1[0].buffer, matrix2[0].datasize);
+  memcpy (out[0].buffer, in[0].buffer, out[0].datasize);
 
   return (TRUE);