summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorztenghui <ztenghui@google.com>2013-05-15 17:25:40 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-05-15 17:25:40 +0000
commitcbe3447fab97f3c4ffb0a792ae4d9cb9d3b558c6 (patch)
tree1d317ea5855d0c81fafeca676dba36761b1c2c9b /src/com
parentd31cdfeb1035df8ba939e877031769f0df247aa6 (diff)
parentf4862f0a3df697db6000972dbfd5387727506072 (diff)
downloadandroid_packages_apps_Snap-cbe3447fab97f3c4ffb0a792ae4d9cb9d3b558c6.tar.gz
android_packages_apps_Snap-cbe3447fab97f3c4ffb0a792ae4d9cb9d3b558c6.tar.bz2
android_packages_apps_Snap-cbe3447fab97f3c4ffb0a792ae4d9cb9d3b558c6.zip
Merge "Fix another annoying warning log spam" into gb-ub-photos-bryce
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/gallery3d/filtershow/ui/FilterIconButton.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/filtershow/ui/FilterIconButton.java b/src/com/android/gallery3d/filtershow/ui/FilterIconButton.java
index a15060b59..c3c87694a 100644
--- a/src/com/android/gallery3d/filtershow/ui/FilterIconButton.java
+++ b/src/com/android/gallery3d/filtershow/ui/FilterIconButton.java
@@ -20,6 +20,7 @@ import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Canvas;
+import android.graphics.RectF;
import android.util.AttributeSet;
import android.view.View;
import android.widget.LinearLayout;
@@ -30,6 +31,7 @@ import com.android.gallery3d.filtershow.cache.RenderingRequestCaller;
import com.android.gallery3d.filtershow.category.Action;
import com.android.gallery3d.filtershow.filters.FilterRepresentation;
import com.android.gallery3d.filtershow.imageshow.GeometryListener;
+import com.android.gallery3d.filtershow.imageshow.GeometryMetadata;
import com.android.gallery3d.filtershow.imageshow.MasterImage;
import com.android.gallery3d.filtershow.presets.ImagePreset;
import com.android.gallery3d.filtershow.tools.IconFactory;
@@ -148,6 +150,12 @@ public class FilterIconButton extends IconButton implements View.OnClickListener
if (dst != null && mAction != null) {
ImagePreset mPreset = new ImagePreset();
mPreset.addFilter(mFilterRepresentation);
+
+ GeometryMetadata geometry = mPreset.mGeoData;
+ RectF bound = new RectF(0, 0, dst.getWidth(), dst.getHeight());
+ geometry.setCropBounds(bound);
+ geometry.setPhotoBounds(bound);
+
RenderingRequest.post(dst.copy(Bitmap.Config.ARGB_8888, true),
mPreset, RenderingRequest.ICON_RENDERING, this);
}