TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 19:08:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix more odd cases

Browse Source
This commit is contained in:
David Rose 2007-06-29 01:36:49 +00:00
parent 9857a9a24e
commit 33722a16c1
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
panda/src/putil/bitArray.cxx
View File

@ -455,7 +455,7 @@ get_next_higher_different_bit(int low_bit) const {
return low_bit; return low_bit;
} }
int b2 = _array[w].get_next_higher_different_bit(b); int b2 = _array[w].get_next_higher_different_bit(b);
if (b2 != b) { if (b2 != b && b2 < num_bits_per_word) {
// The next higher bit is within the same word. // The next higher bit is within the same word.
return w * num_bits_per_word + b2; return w * num_bits_per_word + b2;
} }
@ -467,13 +467,15 @@ get_next_higher_different_bit(int low_bit) const {
++w2; ++w2;
} }
if (w2 >= num_words) { if (w2 >= num_words) {
return low_bit; // All bits higher are the same value.
int is_on = _array[w].get_bit(b);
return is_on ? (num_words * num_bits_per_word) : low_bit;
} }
if (_array[w2].get_bit(0) != _array[w].get_bit(b)) { if (_array[w2].get_bit(0) != _array[w].get_bit(b)) {
// The first bit of word w2 is different. // The first bit of word w2 is different.
return w2 * num_bits_per_word; return w2 * num_bits_per_word;
} }
b2 = _array[w2].get_next_higher_different_bit(0); b2 = _array[w2].get_next_higher_different_bit(0);
return w2 * num_bits_per_word + b2; return w2 * num_bits_per_word + b2;
} }