Changeset 8582 for trunk/psModules

Timestamp:

Aug 24, 2006, 4:49:40 PM (20 years ago)

Author:

Paul Price

Message:

generateTrimBias was not storing the newly created trimsec.

File:

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

trunk/psModules/src/camera/pmHDUGenerate.c

@@ -190 +190 @@
     psListIteratorSet(cellsIter, PS_LIST_HEAD);
     while ((cell = psListGetAndIncrement(cellsIter))) {
-        psRegion *trimsec = psMetadataLookupPtr(&mdok, cell->concepts, "CELL.TRIMSEC"); // Trim section
-        if (!mdok || !trimsec) {
+        psMetadataItem *trimsecItem = psMetadataLookup(cell->concepts, "CELL.TRIMSEC"); // Item with trimsec
+        if (!trimsecItem || trimsecItem->type != PS_DATA_REGION) {
             psLogMsg(__func__, PS_LOG_WARN, "CELL.TRIMSEC has not been initialised in cell --- "
                      "ignored.\n");
             continue;
         }
+        psRegion *trimsec = trimsecItem->data.V; // Trim section
 
         int cellreaddir = psMetadataLookupS32(&mdok, cell->concepts, "CELL.READDIR"); // Read direction
@@ -215 +216 @@
             continue;
         }
-        psFree(trimsec);                // Drop old reference
-        trimsec = sectionForImage(&position, image, cellreaddir); // New reference
+        // New reference
+        trimsec = sectionForImage(&position, image, cellreaddir);
+        psFree(trimsecItem->data.V);
+        trimsecItem->data.V = trimsec;
     }