fix bug in compact lookup that prevented merging with higher chunks

coalsont · coalsont · commit 0911f0ac9a45 · 2014-06-10T20:30:34.000-05:00
diff --git a/Common/CompactLookup.h b/Common/CompactLookup.h
@@ -136,7 +136,7 @@ namespace cifti
             return m_chunks[high - 1].elements[index - m_chunks[high - 1].start];
         }
         if (high > 0 && m_chunks[high - 1].start + (int64_t)(m_chunks[high - 1].elements.size()) == index) attach_low = true;//index is 1 beyond the range
-        if (high < numChunks && m_chunks[high].start + 1 == index) attach_high = true;//index is 1 before the next range
+        if (high < numChunks && m_chunks[high].start == index + 1) attach_high = true;//index is 1 before the next range
         if (attach_low)
         {
             std::vector<T>& lowvec = m_chunks[high - 1].elements;

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ namespace cifti`
`136`	`136`	`return m_chunks[high - 1].elements[index - m_chunks[high - 1].start];`
`137`	`137`	`}`
`138`	`138`	`if (high > 0 && m_chunks[high - 1].start + (int64_t)(m_chunks[high - 1].elements.size()) == index) attach_low = true;//index is 1 beyond the range`
`139`		`- if (high < numChunks && m_chunks[high].start + 1 == index) attach_high = true;//index is 1 before the next range`
	`139`	`+ if (high < numChunks && m_chunks[high].start == index + 1) attach_high = true;//index is 1 before the next range`
`140`	`140`	`if (attach_low)`
`141`	`141`	`{`
`142`	`142`	`std::vector<T>& lowvec = m_chunks[high - 1].elements;`