Changeset 29798

Timestamp:

Nov 18, 2010, 2:48:21 PM (15 years ago)

Author:

eugene

Message:

allow input secfilt to be longer than output (silently skip the extras)

File:

• branches/eam_branches/ipp-20101103/Ohana/src/dvomerge/src/merge_catalogs_old.c (modified) (1 diff)

branches/eam_branches/ipp-20101103/Ohana/src/dvomerge/src/merge_catalogs_old.c

@@ -240 +240 @@
     } else {
       for (k = 0; k < NsecfiltIn; k++) {
+        if (secfiltMap[k] < 0) continue;  // skip secfilt entries from input that are not in the output
+
         // index for this entry in output's secfilt list
         int outputIndex = n * NsecfiltOut + secfiltMap[k];