Changeset 31254

Timestamp:

Apr 10, 2011, 10:14:46 AM (15 years ago)

Author:

eugene

Message:

PS1_REF format is another without catID : need to place before PS1_V1 and later; drop unneeded warning

Location:

branches/eam_branches/ipp-20110404/Ohana/src/libdvo

Files:

• include/dvo.h (modified) (1 diff)
• src/dvo_catalog_split.c (modified) (1 diff)

branches/eam_branches/ipp-20110404/Ohana/src/libdvo/include/dvo.h

@@ -20 +20 @@
   DVO_FORMAT_PS1_DEV_2,
   DVO_FORMAT_PS1_DEV_3,
+  DVO_FORMAT_PS1_REF,
   DVO_FORMAT_PS1_V1,
   DVO_FORMAT_PS1_V2,
-  DVO_FORMAT_PS1_REF
 } DVOTableFormat;
 

branches/eam_branches/ipp-20110404/Ohana/src/libdvo/src/dvo_catalog_split.c

@@ -448 +448 @@
     catalog[0].measure = FtableToMeasure (&ftable, &Nmeasure, &catalog[0].catformat);
     if (Nmeasure != Nrows) {
-      fprintf (stderr, "Warning: mismatch between Nmeasure in PHU and Table headers ("OFF_T_FMT" vs "OFF_T_FMT")\n",  Nmeasure,  Nrows);
+      // XXX this condition denotes the eof has been reached; not an error or a warning
+      // fprintf (stderr, "Warning: mismatch between Nmeasure in PHU and Table headers ("OFF_T_FMT" vs "OFF_T_FMT")\n",  Nmeasure,  Nrows);
     }
     gfits_free_header (&header);