diff options
| author | nicolasroard <nicolasroard@google.com> | 2013-02-27 17:47:06 -0800 |
|---|---|---|
| committer | nicolasroard <nicolasroard@google.com> | 2013-02-27 17:47:13 -0800 |
| commit | 65e47f698043f95ed8067e8c41397c472e5e433a (patch) | |
| tree | d7e843e1595968ac10df7b175ae90d4ddd54f030 /src | |
| parent | cad3dd97f0c169b22e9d55e5ef38384075a4f4be (diff) | |
| download | android_packages_apps_Gallery2-65e47f698043f95ed8067e8c41397c472e5e433a.tar.gz android_packages_apps_Gallery2-65e47f698043f95ed8067e8c41397c472e5e433a.tar.bz2 android_packages_apps_Gallery2-65e47f698043f95ed8067e8c41397c472e5e433a.zip | |
Fix scale and full res preview
Change-Id: Ie432c2d1d631c37f54bd144c22d62cd59d7a665d
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/cache/ImageLoader.java | 3 | ||||
| -rw-r--r-- | src/com/android/gallery3d/filtershow/presets/ImagePreset.java | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java index d284a0338..1aeb6b578 100644 --- a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java +++ b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java @@ -409,7 +409,8 @@ public class ImageLoader { } if (bmp != null) { float scaleFactor = imagePreset.getScaleFactor(); - imagePreset.setScaleFactor(1.0f); + float scale = (float) bmp.getWidth() / (float) getOriginalBounds().width(); + imagePreset.setScaleFactor(scale); bmp = imagePreset.apply(bmp); imagePreset.setScaleFactor(scaleFactor); mZoomCache.setImage(imagePreset, bounds, bmp); diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java index 7ceed733b..14c671e9f 100644 --- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java +++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java @@ -448,7 +448,7 @@ public class ImagePreset { if (mBorder != null && !mBorder.supportsPartialRendering()) { return false; } - if (ImageLoader.getZoomOrientation() != 0) { + if (ImageLoader.getZoomOrientation() != ImageLoader.ORI_NORMAL) { return false; } for (int i = 0; i < mFilters.size(); i++) { |