aboutsummaryrefslogtreecommitdiff
path: root/library/src
diff options
context:
space:
mode:
authorDavid Morrissey <davemorrissey@gmail.com>2016-11-05 12:30:45 +0000
committerDavid Morrissey <davemorrissey@gmail.com>2016-11-05 12:30:45 +0000
commit72ad35b81f7d15ccdf64a5c272124af5b0460612 (patch)
treee2a938396f4cbac206444241209761a53eac4fec /library/src
parente221de00925c4354a9629ae522bef48ed6d530ff (diff)
downloadsubsampling-scale-image-view-72ad35b81f7d15ccdf64a5c272124af5b0460612.tar.gz
Avoid preload with auto tile dimensions
Diffstat (limited to 'library/src')
-rw-r--r--library/src/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/library/src/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.java b/library/src/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.java
index 2e68d41..d388ec0 100644
--- a/library/src/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.java
+++ b/library/src/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.java
@@ -1164,7 +1164,7 @@ public class SubsamplingScaleImageView extends View {
* the base layer image - the whole source subsampled as necessary.
*/
private synchronized void initialiseBaseLayer(Point maxTileDimensions) {
- debug("initialiseBaseLayer maxTimeDimensions=%dx%d", maxTileDimensions.x, maxTileDimensions.y);
+ debug("initialiseBaseLayer maxTileDimensions=%dx%d", maxTileDimensions.x, maxTileDimensions.y);
satTemp = new ScaleAndTranslate(0f, new PointF(0, 0));
fitToBounds(true, satTemp);
@@ -1528,7 +1528,7 @@ public class SubsamplingScaleImageView extends View {
this.sHeight = sHeight;
this.sOrientation = sOrientation;
checkReady();
- if (!checkImageLoaded() && maxTileWidth > 0 && maxTileHeight > 0 && getWidth() > 0 && getHeight() > 0) {
+ if (!checkImageLoaded() && maxTileWidth > 0 && maxTileWidth != TILE_SIZE_AUTO && maxTileHeight > 0 && maxTileHeight != TILE_SIZE_AUTO && getWidth() > 0 && getHeight() > 0) {
initialiseBaseLayer(new Point(maxTileWidth, maxTileHeight));
}
invalidate();