Changeset 29390

Timestamp:

Oct 13, 2010, 12:38:33 PM (16 years ago)

Author:

bills

Message:

minor changes to be compatible with streaksrelease

Location:

trunk/psModules/src/extras

Files:

• pmCensor.c (modified) (7 diffs)
• pmCensor.h (modified) (1 diff)

trunk/psModules/src/extras/pmCensor.c

@@ -3 +3 @@
 
 bool
-pmCensorGetMask(pmConfig *config, psU32 *pMaskMask)
+pmCensorGetMasks(pmConfig *config, psU32 *pMaskCensor, psU32 *pMaskStreak)
 {
     bool status;
@@ -12 +12 @@
     }
 
-    // first look for the value in the recipes
-    psU32 maskMask = psMetadataLookupU32(&status, config->camera, "MASK.NO.CENSOR");
-    if (status) {
-        // All done
-        *pMaskMask = ~maskMask;
-        return true;
-    }
-    // Not defined. Now we must compute it.
 
     // Older sets of mask values had SPIKE and STARCORE with the same value as STREAK
@@ -28 +20 @@
         return false;
     }
+    *pMaskStreak = streak;
+
+    // first look for the value in the recipes
+    psU32 maskNoCensor = psMetadataLookupU32(&status, config->camera, "MASK.NO.CENSOR");
+    if (status) {
+        // All done
+        *pMaskCensor = ~maskNoCensor;
+        return true;
+    }
+
+    // Not defined. So we must compute it.
 
     // preserve pixels that are only CONV.POOR
@@ -62 +65 @@
     // That was true in older 8 bit mask configurations.
 
-    *pMaskMask = ~(convPoor | suspect | starcore | spike) | streak;
+    *pMaskCensor = ~(convPoor | suspect | starcore | spike) | streak;
 
     return true;
@@ -71 +74 @@
     *pNumCensored = 0;
 
-    psU32 maskMask;
-    if (!pmCensorGetMask(config, &maskMask)) {
+    psU32 censorMask;
+    psU32 streakMask;
+    if (!pmCensorGetMasks(config, &censorMask, &streakMask)) {
         psError(PS_ERR_UNKNOWN, false, "failed to lookup set of mask bits to censor.\n");
         return false;
     }
 
-    if (~maskMask == 0) {
+    if (~censorMask == 0) {
         // censoring masked pixels is not required
         return true;
@@ -84 +88 @@
     double exciseValue;
     if (image->type.type == PS_TYPE_U16) {
+        exciseValue = 0x7fff;
+    } else if (image->type.type == PS_TYPE_U16) {
         exciseValue = 0xffff;
     } else if (image->type.type == PS_TYPE_F32) {
@@ -96 +102 @@
         for (int x=0; x<image->numCols; x++) {
             psU16 maskVal = psImageGet(mask, x, y);
-            if (maskVal & maskMask) {
+            if (maskVal & censorMask) {
                 (*pNumCensored)++;
                 psImageSet(image, x, y, exciseValue);

trunk/psModules/src/extras/pmCensor.h

@@ -4 +4 @@
 #include <pmConfig.h>
 
-bool pmCensorGetMask(pmConfig *config, psU32 *pMaskMask);
+bool pmCensorGetMask(pmConfig *config, psU32 *pMaskCensor, psU32 *pMaskStreak);
 bool pmCensorMasked(pmConfig *config, psImage *image, psImage *mask, psImage *variance, long *pNumCensored);