Changeset 38986 for trunk/Ohana/src/libfits/table/F_read_T.c

Timestamp:

Oct 27, 2015, 4:49:06 PM (11 years ago)

Author:

eugene

Message:

extensive work on relphot, relastro, uniphot, dvomerge aiming to the construction and calibration of PV3

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/libfits/table/F_read_T.c (modified) (2 diffs)

trunk/Ohana/src/libfits/table/F_read_T.c

@@ -62 +62 @@
 
 /*********************** fits read ftable data ***********************************/
-int gfits_fread_ftable_range (FILE *f, int padIfShort, FTable *table, off_t start, off_t Nrows) {
+int gfits_fread_ftable_range (FILE *f, int padIfShort, int noSeek, FTable *table, off_t start, off_t Nrows) {
 
   off_t Nbytes, Nread, Nskip, Nx, Ny;
@@ -79 +79 @@
   Nskip = start * Nx;
   Nbytes = Nrows * Nx;
-  ALLOCATE (table[0].buffer, char, MAX (Nbytes, 1));
-
-  fseeko (f, Nskip, SEEK_CUR);
+
+  if (table[0].buffer) {
+    if (table[0].datasize < Nbytes) {
+      REALLOCATE (table[0].buffer, char, MAX (Nbytes, 1));
+    }
+  } else {
+    ALLOCATE (table[0].buffer, char, MAX (Nbytes, 1));
+  }
+
+  if (!noSeek) {
+    fseeko (f, Nskip, SEEK_CUR);
+  }
 
   Nread = fread (table[0].buffer, sizeof (char), Nbytes, f);