diff options
author | Ruben Brunk <rubenbrunk@google.com> | 2013-07-18 16:37:30 -0700 |
---|---|---|
committer | Ruben Brunk <rubenbrunk@google.com> | 2013-08-01 09:46:44 -0700 |
commit | 203eb404a7cd6a80397535e63d22b3772939f03d (patch) | |
tree | c6cc970ad5bf9fc710cb3a8a2a667729b2439623 /src/com/android/gallery3d/filtershow/filters/ImageFilterStraighten.java | |
parent | 3a5bc6b23096365e1a814f8999937028bc12b401 (diff) | |
download | android_packages_apps_Snap-203eb404a7cd6a80397535e63d22b3772939f03d.tar.gz android_packages_apps_Snap-203eb404a7cd6a80397535e63d22b3772939f03d.tar.bz2 android_packages_apps_Snap-203eb404a7cd6a80397535e63d22b3772939f03d.zip |
Refactoring Geometry handling.
Bug: 9170644
Bug: 9366654
Bug: 9366263
- Consolidates all the geometry transforms in GeometryMathUtils and
significantly reduces complexity.
- Removes GeometryMetadata object and dependent code.
- Removes ImageGeometry and geometry update callbacks.
Change-Id: I59add51907459593244c9ebaadef585efc7486d5
Diffstat (limited to 'src/com/android/gallery3d/filtershow/filters/ImageFilterStraighten.java')
-rw-r--r-- | src/com/android/gallery3d/filtershow/filters/ImageFilterStraighten.java | 89 |
1 files changed, 0 insertions, 89 deletions
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterStraighten.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterStraighten.java deleted file mode 100644 index a3bb6f980..000000000 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterStraighten.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright (C) 2012 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.gallery3d.filtershow.filters; - -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; - -public class ImageFilterStraighten extends ImageFilter { - private final Bitmap.Config mConfig = Bitmap.Config.ARGB_8888; - private float mRotation; - private float mZoomFactor; - - public ImageFilterStraighten() { - mName = "Straighten"; - } - - @Override - public ImageFilter clone() throws CloneNotSupportedException { - // FIXME: clone() should not be needed. Remove when we fix geometry. - ImageFilterStraighten filter = (ImageFilterStraighten) super.clone(); - filter.mRotation = mRotation; - filter.mZoomFactor = mZoomFactor; - return filter; - } - - public ImageFilterStraighten(float rotation, float zoomFactor) { - mRotation = rotation; - mZoomFactor = zoomFactor; - } - - public void setRotation(float rotation) { - mRotation = rotation; - } - - public void setRotationZoomFactor(float zoomFactor) { - mZoomFactor = zoomFactor; - } - - @Override - public void useRepresentation(FilterRepresentation representation) { - - } - - @Override - public Bitmap apply(Bitmap bitmap, float scaleFactor, int quality) { - // TODO: implement bilinear or bicubic here... for now, just use - // canvas to do a simple implementation... - // TODO: and be more memory efficient! (do it in native?) - - Bitmap temp = bitmap.copy(mConfig, true); - Canvas canvas = new Canvas(temp); - canvas.save(); - Rect bounds = new Rect(0, 0, bitmap.getWidth(), bitmap.getHeight()); - float w = temp.getWidth(); - float h = temp.getHeight(); - float mw = temp.getWidth() / 2.0f; - float mh = temp.getHeight() / 2.0f; - - canvas.scale(mZoomFactor, mZoomFactor, mw, mh); - canvas.rotate(mRotation, mw, mh); - canvas.drawBitmap(bitmap, bounds, bounds, new Paint()); - canvas.restore(); - - int[] pixels = new int[(int) (w * h)]; - temp.getPixels(pixels, 0, (int) w, 0, 0, (int) w, (int) h); - bitmap.setPixels(pixels, 0, (int) w, 0, 0, (int) w, (int) h); - temp.recycle(); - temp = null; - pixels = null; - return bitmap; - } - -} |