Merge pull request #947 from bponsler/billboardline-fix

Fix for chainIndex out of bounds in BillboardChain::addChainElement
ros-visualization · Feb 26, 2016 · bbfb0c5 · bbfb0c5
2 parents a27b24a + a479af3
commit bbfb0c5
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/rviz/ogre_helpers/billboard_line.cpp b/src/rviz/ogre_helpers/billboard_line.cpp
@@ -149,7 +149,15 @@ void BillboardLine::setupChains()
     if (it + 1 == end)
     {
       uint32_t lines_left = num_lines_ % lines_per_chain_;
-      (*it)->setNumberOfChains(lines_left);
+
+      // Handle the case where num_lines_ is a multiple of lines_per_chain
+      if (lines_left == 0) {
+          (*it)->setNumberOfChains(lines_per_chain_);
+      }
+      else
+      {
+          (*it)->setNumberOfChains(lines_left);
+      }
     }
     else
     {
@@ -287,5 +295,3 @@ const Ogre::Quaternion& BillboardLine::getOrientation()
 }
 
 } // namespace rviz
-
-