Changeset 11435

Timestamp:

Jan 30, 2007, 9:54:15 AM (19 years ago)

Author:

Paul Price

Message:

Not sure why the header copying was ifdef-ed out (perhaps I was
concerned about memory leaks, but there doesn't seem to be any ---
they were coming from somewhere else). Restoring it for now, and
making sure the header is created if it doesn't exist.

File:

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

trunk/psModules/src/camera/pmFPACopy.c

@@ -37 +37 @@
 }
 
-#if 0
+#if 1
 // Find the blank (image-less) PHU, given a cell.
 static pmHDU *findBlankPHU(const pmCell *cell // The cell for which to find the PHU
@@ -279 +279 @@
     binItem->data.S32 *= yBin;
 
-    #if 0
     // Copy any headers
     pmHDU *targetHDU = pmHDUFromCell(target); // The target HDU
-    if (targetHDU && !targetHDU->header) {
+    if (targetHDU) {
+        if (!targetHDU->header) {
+            targetHDU->header = psMetadataAlloc();
+        }
         pmHDU *sourceHDU = pmHDUFromCell(source); // The source HDU
         if (sourceHDU->header) {
@@ -291 +293 @@
     // Copy the PHU over as well, if required
     pmHDU *targetPHU = findBlankPHU(target); // The target PHU
-    if (targetPHU && targetPHU != targetHDU && !targetPHU->header) {
+    if (targetPHU && targetPHU != targetHDU) {
+        if (!targetPHU->header) {
+            targetPHU->header = psMetadataAlloc();
+        }
         //        pmHDU *sourcePHU = pmHDUGetHighest(source->parent->parent, source->parent, source); // A source HDU
         pmHDU *sourcePHU = findBlankPHU(source); // The target PHU
@@ -298 +303 @@
         }
     }
-    #endif
 
     target->data_exists = true;