Changeset 40127

Timestamp:

Sep 4, 2017, 3:52:07 PM (9 years ago)

Author:

eugene

Message:

build empty next_lensobj if output has no lensobj (if the entire output catalog is empty, but input catalog is empty)

File:

• trunk/Ohana/src/dvomerge/src/build_links.c (modified) (2 diffs)

trunk/Ohana/src/dvomerge/src/build_links.c

@@ -448 +448 @@
 off_t *build_lensobj_links (Average *average, off_t Naverage, Lensobj *lensobj, off_t Nlensobj) {
 
-  fprintf (stderr, "input is not sorted but contains lensobj -- trouble\n");
-  exit (2);
-
-# if (0)
-
-  off_t i, m, k, Nm, averef;
+  if (Nlensobj) {
+    fprintf (stderr, "input is not sorted but contains lensobj -- trouble\n");
+    exit (2);
+  }
+
+  off_t i;
   off_t *next_lensobj;
 
@@ -464 +464 @@
   }
 
-  for (Nm = 0; Nm < Nlensobj; Nm++) {
-    averef = lensobj[Nm].averef;
-    m = average[averef].lensobjOffset;  
-    next_lensobj[Nm] = -1;
-
-    if (m == -1) { /* no links yet for source */
-      average[averef].lensobjOffset = Nm;
-      average[averef].Nlensobj     = 1;
-      continue;
-    }
-
-    for (k = 0; next_lensobj[m] != -1; k++) {
-      m = next_lensobj[m];
-      if (m >= Nlensobj) {
-        fprintf (stderr, "WARNING: m out of bounds (1)\n");
-      }
-    }
-
-    average[averef].Nlensobj = k + 2;
-    next_lensobj[m] = Nm;
-    if (m >= Nlensobj) {
-      fprintf (stderr, "WARNING: m out of bounds (2)\n");
-    }
-  }
   return (next_lensobj);
-# endif
 }