From 8d7a0fc4d2705ccfe81d650245dc221ec981db49 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 2 Dec 2012 23:56:43 +0400 Subject: Revert "runtime thumbnails" This reverts commit df1b02237bfb79b51a29392ca4b3d2cd094dcacb. Conflicts: src/org/fox/ttcomics/ComicFragment.java src/org/fox/ttcomics/ComicPager.java --- src/it/sephiroth/android/library/imagezoom/ImageViewTouchBase.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/it/sephiroth/android') diff --git a/src/it/sephiroth/android/library/imagezoom/ImageViewTouchBase.java b/src/it/sephiroth/android/library/imagezoom/ImageViewTouchBase.java index 51dce5b..a0e1a3b 100644 --- a/src/it/sephiroth/android/library/imagezoom/ImageViewTouchBase.java +++ b/src/it/sephiroth/android/library/imagezoom/ImageViewTouchBase.java @@ -290,8 +290,8 @@ public class ImageViewTouchBase extends ImageView implements IDisposable { float w = bitmap.getIntrinsicWidth(); float h = bitmap.getIntrinsicHeight(); matrix.reset(); - float widthScale = viewWidth / w; //Math.min( viewWidth / w, MAX_ZOOM ); - float heightScale = viewHeight / h; //Math.min( viewHeight / h, MAX_ZOOM ); + float widthScale = Math.min( viewWidth / w, MAX_ZOOM ); + float heightScale = Math.min( viewHeight / h, MAX_ZOOM ); float scale = Math.min( widthScale, heightScale ); matrix.postScale( scale, scale ); matrix.postTranslate( ( viewWidth - w * scale ) / MAX_ZOOM, ( viewHeight - h * scale ) / MAX_ZOOM ); -- cgit v1.2.3