Changeset 29392

Timestamp:

Oct 13, 2010, 1:26:42 PM (16 years ago)

Author:

bills

Message:

get the mask bits to censor from new function in psModules

File:

• trunk/magic/remove/src/streaksio.c (modified) (1 diff)

trunk/magic/remove/src/streaksio.c

@@ -1266 +1266 @@
         return;
     }
-    if (sfiles->inMask && sfiles->inMask->header) {
-        if (!pmConfigMaskReadHeader(sfiles->config, sfiles->inMask->header)) {
-            streaksExit("failed to read mask values from file", PS_EXIT_CONFIG_ERROR);
-        }
-    }
-
-    bool status;
-    psMetadata *masks = psMetadataLookupMetadata(&status, sfiles->config->recipes, "MASKS");
-    if (!status) {
-        psError(PM_ERR_CONFIG, false, "failed to lookup MASKS in recipes\n");
-        streaksExit("", PS_EXIT_CONFIG_ERROR);
-    }
-    sfiles->maskStreak = psMetadataLookupU32(&status, masks, "STREAK");
-    if (!status) {
-        psError(PM_ERR_CONFIG, false, "failed to lookup mask value for STREAK in recipes\n");
-        streaksExit("", PS_EXIT_CONFIG_ERROR);
-    }
-
-    // optionally setting pixels with any mask bits execpt CONV.POOR to NAN
-    // check old name first
-    psU32 convPoor = (double) psMetadataLookupU32(&status, masks, "POOR.WARP");
-    if (!status) {
-        convPoor = (double) psMetadataLookupU32(&status, masks, "CONV.POOR");
-        if (!status) {
-            psError(PM_ERR_CONFIG, false, "failed to lookup mask value for CONV.POOR in recipes\n");
-            streaksExit("", PS_EXIT_CONFIG_ERROR);
-        }
-    }
-    // preserve pixels that are only suspect
-    psU32 suspect = (double) psMetadataLookupU32(&status, masks, "SUSPECT");
-    if (!status) {
-        psError(PM_ERR_CONFIG, false, "failed to lookup mask value for SUSPECT in recipes\n");
-        streaksExit("", PS_EXIT_CONFIG_ERROR);
-    }
-
-    sfiles->maskMask = ~(convPoor | suspect);
+    if (!pmCensorGetMasks(sfiles->config, &sfiles->maskMask, &sfiles->maskStreak)) {
+        streaksExit("failed to find mask values", PS_EXIT_CONFIG_ERROR);
+    }
 }