Changeset 28310

Timestamp:

Jun 14, 2010, 1:27:33 PM (16 years ago)

Author:

bills

Message:

Don't set pixels that are SUSPECT to NAN

Location:

trunk

Files:

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

trunk/magic/remove/src/streaksio.c

@@ -1294 +1294 @@
         }
     }
-    sfiles->maskMask = ~convPoor;
+    // 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);
 }
 

trunk/pstamp/src/ppstampMakeStamp.c

@@ -688 +688 @@
         }
     }
-    psU32 maskMask = ~convPoor;
+    psU32 suspect = psMetadataLookupU32(&status, masks, "SUSPECT");
+    if (!status) {
+        psError(PM_ERR_CONFIG, false, "failed to lookup mask value for SUSPECT in recipes\n");
+        return false;
+    }
+    psU32 maskMask = ~(convPoor | suspect);
 
     double exciseValue;