diff options
| author | Neil Fuller <nfuller@google.com> | 2014-10-02 10:18:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-02 10:18:29 +0000 |
| commit | ee665151a4c6359cbfbb9a6795aa9097c4622083 (patch) | |
| tree | 42274866ba592cd70031f4e32f7e3a9399d38a35 /tests/Camera2Tests | |
| parent | 152d9aae631381ea28f5701168d372a1486a7502 (diff) | |
| parent | 0c1faf43aecadc37b78c4ad6cb669eb351d21385 (diff) | |
| download | frameworks_base-ee665151a4c6359cbfbb9a6795aa9097c4622083.zip frameworks_base-ee665151a4c6359cbfbb9a6795aa9097c4622083.tar.gz frameworks_base-ee665151a4c6359cbfbb9a6795aa9097c4622083.tar.bz2 | |
am 0c1faf43: Merge "Switch from FloatMath -> Math and Math.hypot where possible"
* commit '0c1faf43aecadc37b78c4ad6cb669eb351d21385':
Switch from FloatMath -> Math and Math.hypot where possible
Diffstat (limited to 'tests/Camera2Tests')
| -rw-r--r-- | tests/Camera2Tests/SmartCamera/SimpleCamera/src/androidx/media/filterfw/CropFilter.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/Camera2Tests/SmartCamera/SimpleCamera/src/androidx/media/filterfw/CropFilter.java b/tests/Camera2Tests/SmartCamera/SimpleCamera/src/androidx/media/filterfw/CropFilter.java index 91fe21c..6c0f353 100644 --- a/tests/Camera2Tests/SmartCamera/SimpleCamera/src/androidx/media/filterfw/CropFilter.java +++ b/tests/Camera2Tests/SmartCamera/SimpleCamera/src/androidx/media/filterfw/CropFilter.java @@ -20,7 +20,6 @@ import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Matrix; import android.graphics.Paint; -import android.util.FloatMath; import androidx.media.filterfw.Filter; import androidx.media.filterfw.FrameImage2D; @@ -90,8 +89,8 @@ public class CropFilter extends Filter { // Pull input frame FrameImage2D inputImage = getConnectedInputPort("image").pullFrame().asFrameImage2D(); int[] inDims = inputImage.getDimensions(); - int[] croppedDims = { (int)FloatMath.ceil(mCropRect.xEdge().length() * inDims[0]), - (int)FloatMath.ceil(mCropRect.yEdge().length() * inDims[1]) }; + int[] croppedDims = { (int)Math.ceil(mCropRect.xEdge().length() * inDims[0]), + (int)Math.ceil(mCropRect.yEdge().length() * inDims[1]) }; int[] outDims = { getOutputWidth(croppedDims[0], croppedDims[1]), getOutputHeight(croppedDims[0], croppedDims[1]) }; FrameImage2D outputImage = outPort.fetchAvailableFrame(outDims).asFrameImage2D(); |