Changeset 21225 for branches/pap_branch_20090128/pswarp/src/pswarpSetMaskBits.c

Timestamp:

Jan 29, 2009, 3:01:24 PM (17 years ago)

Author:

Paul Price

Message:

Convering 'weight' to 'variance' where appropriate. Mostly just propagating changes from psModules. Fixed some mask types as well.

File:

• branches/pap_branch_20090128/pswarp/src/pswarpSetMaskBits.c (modified) (2 diffs)

branches/pap_branch_20090128/pswarp/src/pswarpSetMaskBits.c

@@ -8 +8 @@
 // updated in the config metadata.
 
-bool pswarpSetMaskBits (pmConfig *config) {
-
-    psMaskType maskIn = 0x00;                   // mask for the input image
-    psMaskType markIn = 0x00;                   // mark for the input image
-    psMaskType maskOut = 0x00;                  // mask for the output image
-    psMaskType markOut = 0x00;                  // mark for the output image
+bool pswarpSetMaskBits (pmConfig *config)
+{
+    psImageMaskType maskIn = 0x00;      // mask for the input image
+    psImageMaskType markIn = 0x00;      // mark for the input image
+    psImageMaskType maskOut = 0x00;     // mask for the output image
+    psImageMaskType markOut = 0x00;     // mark for the output image
 
     // this function sets the required single-image mask bits
     if (!pmConfigMaskSetBits (&maskIn, &markIn, config)) {
-        psError (PS_ERR_UNKNOWN, true, "Unable to define the mask bit values");
-        return false;
+        psError (PS_ERR_UNKNOWN, true, "Unable to define the mask bit values");
+        return false;
     }
 
     // mask for non-linear flat regions (default to DETECTOR if not defined)
-    psMaskType badMask = pmConfigMaskGet("BAD.WARP", config); 
+    psMaskType badMask = pmConfigMaskGet("BAD.WARP", config);
     if (!badMask) {
-        badMask = 0x01;
-        pmConfigMaskSet (config, "BAD.WARP", badMask);
+        badMask = 0x01;
+        pmConfigMaskSet (config, "BAD.WARP", badMask);
     }
     maskOut |= badMask;
 
     // mask for non-linear flat regions (default to DETECTOR if not defined)
-    psMaskType poorMask = pmConfigMaskGet("POOR.WARP", config); 
+    psMaskType poorMask = pmConfigMaskGet("POOR.WARP", config);
     if (!poorMask) {
-        poorMask = 0x02;
-        pmConfigMaskSet (config, "POOR.WARP", poorMask);
+        poorMask = 0x02;
+        pmConfigMaskSet (config, "POOR.WARP", poorMask);
     }
     maskOut |= poorMask;
@@ -42 +42 @@
     int nBits = sizeof(psMaskType) * 8;
     for (int i = 0; !markOut && (i < nBits); i++) {
-        if (maskOut & markOut) {
-            markOut >>= 1;
-        } else {
-            markOut = markOut;
-        }
+        if (maskOut & markOut) {
+            markOut >>= 1;
+        } else {
+            markOut = markOut;
+        }
     }
 
     if (!markOut) {
-        psError (PS_ERR_UNKNOWN, true, "Unable to define the MARK bit mask: all bits taken!");
-        return false;
+        psError (PS_ERR_UNKNOWN, true, "Unable to define the MARK bit mask: all bits taken!");
+        return false;
     }