Modified tile map to allow for images close to a multiple of the max …

…bitmap size
davemorrissey · Mar 15, 2015 · 3fee992 · 3fee992
1 parent 81119c9
commit 3fee992
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/library/src/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.java b/library/src/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.java
@@ -1268,12 +1268,12 @@ private void initialiseTileMap(Point maxTileDimensions) {
             int sTileHeight = sHeight()/yTiles;
             int subTileWidth = sTileWidth/sampleSize;
             int subTileHeight = sTileHeight/sampleSize;
-            while (subTileWidth > maxTileDimensions.x || (subTileWidth > getWidth() * 1.25 && sampleSize < fullImageSampleSize)) {
+            while (subTileWidth + xTiles + 1 > maxTileDimensions.x || (subTileWidth > getWidth() * 1.25 && sampleSize < fullImageSampleSize)) {
                 xTiles += 1;
                 sTileWidth = sWidth()/xTiles;
                 subTileWidth = sTileWidth/sampleSize;
             }
-            while (subTileHeight > maxTileDimensions.y || (subTileHeight > getHeight() * 1.25 && sampleSize < fullImageSampleSize)) {
+            while (subTileHeight + yTiles + 1 > maxTileDimensions.y || (subTileHeight > getHeight() * 1.25 && sampleSize < fullImageSampleSize)) {
                 yTiles += 1;
                 sTileHeight = sHeight()/yTiles;
                 subTileHeight = sTileHeight/sampleSize;