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

Timestamp:

Mar 6, 2008, 1:21:37 PM (18 years ago)

Author:

Paul Price

Message:

CELL.XPARITY and CELL.YPARITY should not be required for the target
--- they can simply inherit from the source.

File:

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

trunk/psModules/src/camera/pmFPACopy.c

@@ -110 +110 @@
 
     // enforce the following conditions:
-    // CELL.XPARITY is required
+    // CELL.XPARITY is required for source
     // CELL.XPARITY must be +/- 1
     int xParitySource = psMetadataLookupS32(&mdokS, source->concepts, "CELL.XPARITY"); // Source parity
     int xParityTarget = psMetadataLookupS32(&mdokT, target->concepts, "CELL.XPARITY"); // Target x parity
     assert(mdokS && mdokT);
-    if (abs(xParitySource) != 1 || abs(xParityTarget) != 1) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                "CELL.XPARITY is not set for both source (%d) and target (%d)",
-                xParitySource, xParityTarget);
+    if (abs(xParitySource) != 1) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "CELL.XPARITY is not set for source (%d)",
+                xParitySource);
         psFree(binning);
         return false;
@@ -132 +131 @@
     int yParitySource = psMetadataLookupS32(&mdokS, source->concepts, "CELL.YPARITY"); // Source parity
     assert(mdokS && mdokT);
-    if (abs(yParitySource) != 1 || abs(yParityTarget) != 1) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                "CELL.YPARITY is not set for both source (%d) and target (%d)",
-                yParitySource, yParityTarget);
+    if (abs(yParitySource) != 1) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "CELL.YPARITY is not set for both source (%d)",
+                yParitySource);
         psFree(binning);
         return false;