Changeset 15219 for trunk/psModules/src/concepts/pmConceptsStandard.c

Timestamp:

Oct 4, 2007, 12:09:50 PM (19 years ago)

Author:

Paul Price

Message:

Catching NULL trimsec.

File:

• trunk/psModules/src/concepts/pmConceptsStandard.c (modified) (2 diffs)

trunk/psModules/src/concepts/pmConceptsStandard.c

@@ -140 +140 @@
 
     if (item->type == PS_DATA_STRING) {
-        return psMetadataItemAllocStr(concept->name, concept->comment, item->data.V);
+        return psMetadataItemAllocStr(concept->name, concept->comment, item->data.V);
     }
 
     if (item->type == PS_DATA_METADATA_MULTI) {
-        psMetadataItem *entry = psListGet (item->data.list, PS_LIST_HEAD);
-        if (!entry) {
-            psError(PS_ERR_UNEXPECTED_NULL, true,
-                    "List for %s in FILTER.ID in camera configuration is empty.\n", key);
-            return NULL;
-        }
-        return psMetadataItemAllocStr(concept->name, concept->comment, entry->data.V);
+        psMetadataItem *entry = psListGet (item->data.list, PS_LIST_HEAD);
+        if (!entry) {
+            psError(PS_ERR_UNEXPECTED_NULL, true,
+                    "List for %s in FILTER.ID in camera configuration is empty.\n", key);
+            return NULL;
+        }
+        return psMetadataItemAllocStr(concept->name, concept->comment, entry->data.V);
     }
 
     psError(PS_ERR_UNEXPECTED_NULL, true,
-            "Unable to find %s in FILTER.ID in camera configuration.\n", key);
+            "Unable to find %s in FILTER.ID in camera configuration.\n", key);
     return NULL;
 }
@@ -800 +800 @@
 
     psRegion *trimsec = psMemIncrRefCounter(concept->data.V); // The trimsec region
+    if (!trimsec) {
+        return psMetadataItemAllocStr(concept->name, concept->comment, NULL);
+    }
 
     // Correct trim section for binning if it's specified explicitly (i.e., immutably) in the CELLS.