diff options
author | ztenghui <ztenghui@google.com> | 2013-05-15 10:37:40 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-15 10:37:40 -0700 |
commit | 56f69010c951298634fc85529cb75842442c2528 (patch) | |
tree | afa9350ca68064c4685f63306b81bd2bf4c475fe /src/com | |
parent | 2b06ff267ca205b72b79ac9b6f8089a623719afe (diff) | |
parent | cbe3447fab97f3c4ffb0a792ae4d9cb9d3b558c6 (diff) | |
download | android_packages_apps_Snap-56f69010c951298634fc85529cb75842442c2528.tar.gz android_packages_apps_Snap-56f69010c951298634fc85529cb75842442c2528.tar.bz2 android_packages_apps_Snap-56f69010c951298634fc85529cb75842442c2528.zip |
am 4aa8d5fc: Merge "Fix another annoying warning log spam" into gb-ub-photos-bryce
* commit '4aa8d5fc9d3478d511786cb99d5ba704d3e1f426':
Fix another annoying warning log spam
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/gallery3d/filtershow/ui/FilterIconButton.java | 8 |
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); } |