Be more careful about bounds-checking. Fixes #45.

JuliaImages · Sep 18, 2014 · 4f86054 · 4f86054
1 parent 5acd32d
commit 4f86054
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/display.jl b/src/display.jl
@@ -177,8 +177,10 @@ parentdims(A::SubArray) = Base.parentdims(A)
 function _reslice!(img2::ImageSlice2d)
     newindexes = copy(img2.indexes)
     bb = img2.zoombb
-    newindexes[img2.xdim] = newindexes[img2.xdim][ifloor(bb.xmin)+1:iceil(bb.xmax)]
-    newindexes[img2.ydim] = newindexes[img2.ydim][ifloor(bb.ymin)+1:iceil(bb.ymax)]
+    xindx = newindexes[img2.xdim]
+    yindx = newindexes[img2.ydim]
+    newindexes[img2.xdim] = xindx[max(1,ifloor(bb.xmin)+1):min(length(xindx),iceil(bb.xmax))]
+    newindexes[img2.ydim] = yindx[max(1,ifloor(bb.ymin)+1):min(length(yindx),iceil(bb.ymax))]
     if img2.zdim > 0
         newindexes[img2.zdim] = newindexes[img2.zdim][img2.zindex]
     end