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

Timestamp:

Jan 8, 2007, 4:22:27 PM (19 years ago)

Author:

Paul Price

Message:

Making sure DEFAULTS are read.

File:

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

trunk/psModules/src/camera/pmFPAConstruct.c

@@ -142 +142 @@
     fpa->hdu = psMemIncrRefCounter(hdu);
     bool success = true;                // Success of reading concepts
-    if (hdu->header && !pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_HEADER, false, NULL)) {
+    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;
@@ -168 +169 @@
     chip->hdu = psMemIncrRefCounter(hdu);
     bool success = true;                // Success of reading concepts
-    if (hdu->header && !pmConceptsReadChip(chip, PM_CONCEPT_SOURCE_HEADER, true, false, NULL)) {
+    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;
@@ -194 +196 @@
     cell->hdu = psMemIncrRefCounter(hdu);
     bool success = true;                // Success of reading concepts
-    if (hdu->header && !pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_HEADER, true, NULL)) {
+    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;
@@ -737 +740 @@
     psFree(contentsIter);
 
-    if (header && !pmConceptsRead(fpa, chip, cell, PM_CONCEPT_SOURCE_PHU, NULL)) {
-        psWarning("Unable to read concepts from PHU.\n");
-    }
-
     if (!pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_DEFAULTS, true, NULL)) {
         psWarning("Unable to read concepts from defaults for FPA.  Attempting to "
                   "proceed anyway.\n");
+    }
+
+    if (header && !pmConceptsRead(fpa, chip, cell, PM_CONCEPT_SOURCE_PHU, NULL)) {
+        psWarning("Unable to read concepts from PHU.\n");
     }