Changeset 21130

Timestamp:

Jan 17, 2009, 10:34:00 AM (17 years ago)

Author:

eugene

Message:

various uses of PS_TYPE_MASK changed to PS_TYPE_IMAGE_MASK

File:

• branches/eam_branch_20081230/psModules/src/config/pmConfigMask.c (modified) (6 diffs)

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

@@ -261 +261 @@
         psMetadataItem *item = psMetadataLookup(fpa->masks, name); // Item in recipe with current value
         if (item) {
-            psAssert(item->type == PS_TYPE_MASK, "Mask entry %s is not of a mask type (%x)",
+            psAssert(item->type == PS_TYPE_IMAGE_MASK, "Mask entry %s is not of a mask type (%x)",
                      name, item->type);
-            if (item->data.PS_TYPE_MASK_DATA != bit) {
+            if (item->data.PS_TYPE_IMAGE_MASK_DATA != bit) {
                 psWarning("New mask entry %s doesn't match previously loaded entry: %x vs %x",
-                          name, bit, item->data.PS_TYPE_MASK_DATA);
+                          name, bit, item->data.PS_TYPE_IMAGE_MASK_DATA);
             }
         } else {
@@ -282 +282 @@
     psMetadataItem *item;               // Item from iteration
     while ((item = psMetadataGetAndIncrement(iter))) {
-        if (item->type != PS_TYPE_MASK) {
+        if (item->type != PS_TYPE_IMAGE_MASK) {
             psWarning("Recipe mask entry %s is not of a mask type (%x)", item->name, item->type);
             continue;
@@ -288 +288 @@
         if (!psMetadataLookup(fpa->masks, item->name)) {
             psMetadataAddImageMask(fpa->masks, PS_LIST_TAIL, item->name, 0, item->comment,
-                            item->data.PS_TYPE_MASK_DATA);
+                            item->data.PS_TYPE_IMAGE_MASK_DATA);
         }
     }
@@ -314 +314 @@
     psMetadataItem *item;               // Item from iteration
     while ((item = psMetadataGetAndIncrement(iter))) {
-        if (item->type != PS_TYPE_MASK) {
+        if (item->type != PS_TYPE_IMAGE_MASK) {
             psWarning("mask recipe entry %s is not of a mask type (%x)", item->name, item->type);
             continue;
@@ -323 +323 @@
 
         psMetadataAddStr(header, PS_LIST_TAIL, namekey, 0, "Bitmask bit name", item->name);
-        psMetadataAddImageMask(header, PS_LIST_TAIL, valuekey, 0, "Bitmask bit value", item->data.PS_TYPE_MASK_DATA);
+        psMetadataAddImageMask(header, PS_LIST_TAIL, valuekey, 0, "Bitmask bit value", item->data.PS_TYPE_IMAGE_MASK_DATA);
         numMask++;
     }
@@ -422 +422 @@
 
         psMetadataItem *item = psMetadataLookup(recipe, name); // Item in recipe with current value
-        if (item && item->type != PS_TYPE_MASK) {
+        if (item && item->type != PS_TYPE_IMAGE_MASK) {
             psWarning("Mask recipe entry is not of a mask type (%x)", item->type);
-            item->type = PS_TYPE_MASK;
+            item->type = PS_TYPE_IMAGE_MASK;
         }