Changeset 12620 for trunk/psModules/src/camera/pmFPAConstruct.c

Timestamp:

Mar 27, 2007, 6:02:32 PM (19 years ago)

Author:

Paul Price

Message:

Update the appropriate source --- if the header is a PHU, that's what should be updated, not "HEADER", but "PHU".

File:

• trunk/psModules/src/camera/pmFPAConstruct.c (modified) (4 diffs)

trunk/psModules/src/camera/pmFPAConstruct.c

@@ -139 +139 @@
     }
     fpa->hdu = psMemIncrRefCounter(hdu);
-    bool success = true;                // Success of reading concepts
-    if (hdu->header && !pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_DEFAULTS | PM_CONCEPT_SOURCE_HEADER,
-                                          false, NULL)) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to read concepts from header.\n");
-        success = false;
-    }
     pmFPASetFileStatus(fpa, true);
 
-    return success;
+    pmConceptSource source = 0;         // Source for concepts
+    if (hdu->header) {
+        if (hdu->blankPHU) {
+            source = PM_CONCEPT_SOURCE_PHU;
+        } else {
+            source = PM_CONCEPT_SOURCE_HEADER;
+        }
+    }
+    source |= PM_CONCEPT_SOURCE_DEFAULTS;
+
+    return pmConceptsReadFPA(fpa, source, false, NULL);
 }
 
@@ -166 +170 @@
     }
     chip->hdu = psMemIncrRefCounter(hdu);
-    bool success = true;                // Success of reading concepts
-    if (hdu->header && !pmConceptsReadChip(chip, PM_CONCEPT_SOURCE_DEFAULTS | PM_CONCEPT_SOURCE_HEADER,
-                                           true, false, NULL)) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to read concepts from header.\n");
-        success = false;
-    }
     pmChipSetFileStatus(chip, true);
-
-    return success;
+    pmConceptSource source = 0;         // Source for concepts
+    if (hdu->header) {
+        if (hdu->blankPHU) {
+            source = PM_CONCEPT_SOURCE_PHU;
+        } else {
+            source = PM_CONCEPT_SOURCE_HEADER;
+        }
+    }
+    source |= PM_CONCEPT_SOURCE_DEFAULTS;
+    return pmConceptsReadChip(chip, source, true, false, NULL);
 }
 
@@ -193 +199 @@
     }
     cell->hdu = psMemIncrRefCounter(hdu);
-    bool success = true;                // Success of reading concepts
-    if (hdu->header && !pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_DEFAULTS | PM_CONCEPT_SOURCE_HEADER,
-                                           true, NULL)) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to read concepts from header.\n");
-        success = false;
-    }
     pmCellSetFileStatus(cell, true);
-
-    return success;
+    pmConceptSource source = 0;         // Source for concepts
+    if (hdu->header) {
+        if (hdu->blankPHU) {
+            source = PM_CONCEPT_SOURCE_PHU;
+        } else {
+            source = PM_CONCEPT_SOURCE_HEADER;
+        }
+    }
+    source |= PM_CONCEPT_SOURCE_DEFAULTS;
+    return pmConceptsReadCell(cell, source, true, NULL);
 }
 
@@ -1205 +1213 @@
     psFree(fpaname);
 
+    if (!pm
+
     return view;
 }