summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
diff options
context:
space:
mode:
authorJohn Hoford <hoford@google.com>2013-02-27 08:41:19 -0800
committerJohn Hoford <hoford@google.com>2013-02-27 17:32:01 -0800
commit63cc04c3b51d544598c8af5c8c16a29b1e902a26 (patch)
tree36a75fe6a9765e0c332f840a50d761511ce7b5c2 /src/com/android/gallery3d/filtershow/cache/ImageLoader.java
parent7c3ff29f5d187a9f8c660f8571a43f5a91b46836 (diff)
downloadandroid_packages_apps_Snap-63cc04c3b51d544598c8af5c8c16a29b1e902a26.tar.gz
android_packages_apps_Snap-63cc04c3b51d544598c8af5c8c16a29b1e902a26.tar.bz2
android_packages_apps_Snap-63cc04c3b51d544598c8af5c8c16a29b1e902a26.zip
refactor the geometry code
Change-Id: I5b0381ec5e127aabf37924af64fbeb490755bc9a
Diffstat (limited to 'src/com/android/gallery3d/filtershow/cache/ImageLoader.java')
-rw-r--r--src/com/android/gallery3d/filtershow/cache/ImageLoader.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
index b5ed9eee0..d284a0338 100644
--- a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
+++ b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
@@ -28,6 +28,7 @@ import android.graphics.BitmapRegionDecoder;
import android.graphics.Matrix;
import android.graphics.Rect;
import android.graphics.Bitmap.CompressFormat;
+import android.graphics.RectF;
import android.media.ExifInterface;
import android.net.Uri;
import android.provider.MediaStore;
@@ -44,8 +45,10 @@ import com.android.gallery3d.exif.ExifTag;
import com.android.gallery3d.filtershow.CropExtras;
import com.android.gallery3d.filtershow.FilterShowActivity;
import com.android.gallery3d.filtershow.HistoryAdapter;
+import com.android.gallery3d.filtershow.imageshow.GeometryMetadata;
import com.android.gallery3d.filtershow.imageshow.ImageCrop;
import com.android.gallery3d.filtershow.imageshow.ImageShow;
+import com.android.gallery3d.filtershow.imageshow.MasterImage;
import com.android.gallery3d.filtershow.presets.ImagePreset;
import com.android.gallery3d.filtershow.tools.BitmapTask;
import com.android.gallery3d.filtershow.tools.SaveCopyTask;
@@ -131,6 +134,15 @@ public class ImageLoader {
return false;
}
updateBitmaps();
+ // TODO: cleanup
+ GeometryMetadata geo = MasterImage.getImage().getPreset().mGeoData;
+ float w = mOriginalBitmapLarge.getWidth();
+ float h = mOriginalBitmapLarge.getHeight();
+ RectF r = new RectF(0, 0, w, h);
+ geo.setPhotoBounds(r);
+ geo.setCropBounds(r);
+ MasterImage.getImage().getPreset().setGeometry(geo);
+ MasterImage.getImage().notifyGeometryChange();
mLoadingLock.unlock();
return true;
}