Changeset 18430 for branches/eam_branch_20080706/psModules/src/config/pmConfigMask.c

Timestamp:

Jul 6, 2008, 6:23:02 PM (18 years ago)

Author:

eugene

Message:

set mask bits based on recipe and input mask image headers

File:

• branches/eam_branch_20080706/psModules/src/config/pmConfigMask.c (modified) (3 diffs)

branches/eam_branch_20080706/psModules/src/config/pmConfigMask.c

@@ -40 +40 @@
 }
 
-// replace the named masks in the recipe with values in the header
+// replace the named masks in the recipe with values in the header:
+// replace only the names in the header in the recipe
 void pmConfigMasksReadHeader (pmConfig *config, psMetadata *header) {
 
@@ -49 +50 @@
     }
 
-    int nMask = 0;
+    int nMask = psMetadataLookupS32 (&status, header, "MSKNUM");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, true, "Unable to find MSKNUM in header.");
+        return false;
+    }
 
-    psMetadataIterator *iter = psMetadataIteratorAlloc(recipe, PS_LIST_HEAD, NULL); // Iterator
+    for (int i = 0; i < nMask; i++) {
 
-    psMetadataItem *item;               // Item from iteration
-    while ((item = psMetadataGetAndIncrement(iter))) {
+        snprintf (namekey,  64, "MSKNAM%02d", i);
+        snprintf (valuekey, 64, "MSKVAL%02d", i);
 
-        if (item->type != PS_DATA_U8) {
-            psWarning("mask recipe entry %s is not a bit value\n", item->name);
-            continue;
+        char *name = psMetadataLookupStr (&status, header, namekey);
+        psU8 bit = psMetadataLookupU8 (&status, header, valuekey);
+
+        // XXX validate that bit is a 2^n value?
+
+        psMetadataItem *item = psMetadataLookup (header, name);
+        if (!item) {
+          psWarning("mask recipe entry %s not in recipe\n", name);
+          psMetadataAddU8 (recipe, PS_LIST_TAIL, name, 0, "Bitmask bit value", bit);
+        } else {
+          item->data.U8 = bit;
         }
-
-        snprintf (namekey,  64, "MSKNAM%02d", nMask);
-        snprintf (valuekey, 64, "MSKVAL%02d", nMask);
-
-        psMetadataAddStr (header, PS_LIST_TAIL, namekey, 0, "Bitmask bit name", item->name);
-        psMetadataAddU8 (header, PS_LIST_TAIL, valuekey, 0, "Bitmask bit value", item->data.U8);
-        nMask ++;
     }
     
-    psMetadataAddU8 (header, PS_LIST_TAIL, "MSKNUM", 0, "Bitmask bit count", nMask);
     return true;
 }
@@ -102 +107 @@
     }
     
-    psMetadataAddU8 (header, PS_LIST_TAIL, "MSKNUM", 0, "Bitmask bit count", nMask);
+    psMetadataAddS32 (header, PS_LIST_TAIL, "MSKNUM", 0, "Bitmask bit count", nMask);
     return true;
 }