fixed ImagePanel indexing issue on C++ side

wjakob · Mar 27, 2019 · d9c9e6a · d9c9e6a
1 parent 375b9eb
commit d9c9e6a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/python/example1.py b/python/example1.py
@@ -152,9 +152,8 @@ def cb():
         imgView = ImageView(img_window, icons[0][0])
 
         def cb(i):
-            if i < len(icons):
-                print("Selected item %i" % i)
-                imgView.bindImage(icons[i][0])
+            print("Selected item %i" % i)
+            imgView.bindImage(icons[i][0])
         imgPanel.setCallback(cb)
 
         imgView.setGridThreshold(3)

diff --git a/src/example1.cpp b/src/example1.cpp
@@ -259,11 +259,9 @@ class ExampleApplication : public nanogui::Screen {
         mCurrentImage = 0;
         // Change the active textures.
         imgPanel->setCallback([this, imageView](int i) {
-            if (i < mImagesData.size()) {
-                imageView->bindImage(mImagesData[i].first.texture());
-                mCurrentImage = i;
-                cout << "Selected item " << i << '\n';
-            }
+            imageView->bindImage(mImagesData[i].first.texture());
+            mCurrentImage = i;
+            cout << "Selected item " << i << '\n';
         });
         imageView->setGridThreshold(20);
         imageView->setPixelInfoThreshold(20);

diff --git a/src/imagepanel.cpp b/src/imagepanel.cpp
@@ -40,15 +40,15 @@ int ImagePanel::indexForPosition(const Vector2i &p) const {
 }
 
 bool ImagePanel::mouseMotionEvent(const Vector2i &p, const Vector2i & /* rel */,
-                              int /* button */, int /* modifiers */) {
+                                  int /* button */, int /* modifiers */) {
     mMouseIndex = indexForPosition(p);
     return true;
 }
 
 bool ImagePanel::mouseButtonEvent(const Vector2i &p, int /* button */, bool down,
                                   int /* modifiers */) {
     int index = indexForPosition(p);
-    if (index >= 0 && mCallback && down)
+    if (index >= 0 && index < (int) mImages.size() && mCallback && down)
         mCallback(index);
     return true;
 }