Changeset 35776

Timestamp:

Jul 3, 2013, 5:36:31 PM (13 years ago)

Author:

watersc1

Message:

merged fixed version from trunk

File:

• tags/ipp-test-20130703/psModules/src/imcombine/pmSubtractionSimple.c (modified) (1 diff, 1 prop)

tags/ipp-test-20130703/psModules/src/imcombine/pmSubtractionSimple.c

@@ -353 +353 @@
     conv1->analysis = psMetadataCopy(conv1->analysis, outAnalysis);
     conv1->data_exists = true;
-    conv1->parent->data_exists = true;
-    conv1->parent->parent->data_exists = true;
+    if (conv1->parent) {
+      conv1->parent->data_exists = true;
+      
+      if (conv1->parent->parent) {
+        conv1->parent->parent->data_exists = true;
+      }
+    }
   }
   if (conv2) {
     conv2->analysis = psMetadataCopy(conv2->analysis, outAnalysis);
     conv2->data_exists = true;
-    conv2->parent->data_exists = true;
-    conv2->parent->parent->data_exists = true;
+    if (conv2->parent) {
+      conv2->parent->data_exists = true;
+      if (conv2->parent->parent) {
+        conv2->parent->parent->data_exists = true;
+      }
+    }
   }