Changeset 23351 for branches/cnb_branches/cnb_branch_20090301/psModules/src/camera/pmFPACopy.c

Timestamp:

Mar 17, 2009, 12:07:42 PM (17 years ago)

Author:

beaumont

Message:

merged with head

Location:

branches/cnb_branches/cnb_branch_20090301/psModules

Files:

• . (modified) (1 prop)
• src/camera/pmFPACopy.c (modified) (2 diffs)

branches/cnb_branches/cnb_branch_20090301/psModules/src/camera/pmFPACopy.c

@@ -173 +173 @@
     int xParityTarget = psMetadataLookupS32(&mdokT, target->concepts, "CELL.XPARITY"); // Target x parity
     assert(mdokS && mdokT);
+
+    if (xParityTarget == 0) {
+        psMetadataItem *item = psMetadataLookup(target->concepts, "CELL.XPARITY"); // Item with parity
+        xParityTarget = item->data.S32 = xParitySource;
+    }
+
     psAssert (abs(xParitySource) == 1, "CELL.XPARITY not set for source");
     psAssert (abs(xParityTarget) == 1, "CELL.XPARITY not set for target");
@@ -192 +198 @@
     int yParitySource = psMetadataLookupS32(&mdokS, source->concepts, "CELL.YPARITY"); // Source parity
     assert(mdokS && mdokT);
+
+    if (yParityTarget == 0) {
+        psMetadataItem *item = psMetadataLookup(target->concepts, "CELL.YPARITY"); // Item with parity
+        yParityTarget = item->data.S32 = yParitySource;
+    }
+
     psAssert (abs(yParitySource) == 1, "CELL.YPARITY not set for source");
     psAssert (abs(yParityTarget) == 1, "CELL.YPARITY not set for target");