Changeset 18350 for branches/eam_branch_20080620/psModules/src/camera/pmFPAfileIO.c

Timestamp:

Jun 27, 2008, 1:56:41 PM (18 years ago)

Author:

eugene

Message:

accepting updates from HEAD

File:

• branches/eam_branch_20080620/psModules/src/camera/pmFPAfileIO.c (modified) (2 diffs)

branches/eam_branch_20080620/psModules/src/camera/pmFPAfileIO.c

@@ -433 +433 @@
         pmChip *chip = pmFPAviewThisChip(view, file->fpa); // Chip of interest, or NULL
         pmCell *cell = pmFPAviewThisCell(view, file->fpa); // Cell of interest, or NULL
-        pmFPAUpdateNames(fpa, chip, cell);
+        if (!pmFPAUpdateNames(fpa, chip, cell)) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to update names in header.");
+            return false;
+        }
 
         pmConceptSource sources = PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_CELLS |
@@ -918 +921 @@
 // XXX this function is only called from pmFPAfileWrite
 // XXX for each data type, there should be a function which writes the PHU, if needed
-bool pmFPAfileWritePHU(pmFPAfile *file, const pmFPAview *view, const pmConfig *config)
+bool pmFPAfileWritePHU(pmFPAfile *file, const pmFPAview *view, pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(file, false);