Changeset 16861 for trunk/psModules/src/camera/pmFPACopy.c

Timestamp:

Mar 6, 2008, 2:09:40 PM (18 years ago)

Author:

Paul Price

Message:

Fixing logic error.

File:

• trunk/psModules/src/camera/pmFPACopy.c (modified) (2 diffs)

trunk/psModules/src/camera/pmFPACopy.c

@@ -120 +120 @@
         psFree(binning);
         return false;
-    }
-    if (xParityTarget != xParitySource) {
-        xFlip = true;
     } else {
         // Use the source parity
         COPY_CONCEPT(target->concepts, source->concepts, "CELL.XPARITY", S32);
+        xParityTarget = xParitySource;
+    }
+    if (xParityTarget != xParitySource) {
+        xFlip = true;
     }
 
@@ -132 +133 @@
     assert(mdokS && mdokT);
     if (abs(yParitySource) != 1) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "CELL.YPARITY is not set for both source (%d)",
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "CELL.YPARITY is not set for source (%d)",
                 yParitySource);
         psFree(binning);
         return false;
-    }
-    if (yParityTarget != yParitySource) {
-        yFlip = true;
     } else {
         // Use the source parity
         COPY_CONCEPT(target->concepts, source->concepts, "CELL.YPARITY", S32);
+        yParityTarget = yParitySource;
+    }
+    if (yParityTarget != yParitySource) {
+        yFlip = true;
     }
     psTrace("psModules.camera", 3, "xFlip: %d; yFlip: %d\n", xFlip, yFlip);