summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/filtershow/imageshow
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2013-07-23 17:10:18 -0700
committernicolasroard <nicolasroard@google.com>2013-07-23 17:10:18 -0700
commitdb68fbd8857ca83b5a54402d1b07c75d36921641 (patch)
tree5bd20ba5129e575cfde8638c8b680a4d1a9f6275 /src/com/android/gallery3d/filtershow/imageshow
parent915304ca96ee8b686944d39c48a5442f27de4b92 (diff)
downloadandroid_packages_apps_Gallery2-db68fbd8857ca83b5a54402d1b07c75d36921641.tar.gz
android_packages_apps_Gallery2-db68fbd8857ca83b5a54402d1b07c75d36921641.tar.bz2
android_packages_apps_Gallery2-db68fbd8857ca83b5a54402d1b07c75d36921641.zip
Fix geometry transform
Change-Id: I0c3af6f4122d045f5a8656bc709127aa7ae2ecab
Diffstat (limited to 'src/com/android/gallery3d/filtershow/imageshow')
-rw-r--r--src/com/android/gallery3d/filtershow/imageshow/ImageShow.java7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
index 1a304db69..1ff4227a7 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
@@ -55,8 +55,6 @@ public class ImageShow extends View implements OnGestureListener,
protected int mTextSize;
protected int mTextPadding;
- protected ImageLoader mImageLoader = null;
-
protected int mBackgroundColor;
private GestureDetector mGestureDetector = null;
@@ -175,7 +173,7 @@ public class ImageShow extends View implements OnGestureListener,
*/
protected Matrix getImageToScreenMatrix(boolean reflectRotation) {
GeometryMetadata geo = getImagePreset().getGeometry();
- if (geo == null || mImageLoader == null
+ if (geo == null
|| MasterImage.getImage().getOriginalBounds() == null) {
return new Matrix();
}
@@ -260,9 +258,6 @@ public class ImageShow extends View implements OnGestureListener,
}
public void resetImageCaches(ImageShow caller) {
- if (mImageLoader == null) {
- return;
- }
MasterImage.getImage().updatePresets(true);
}