diff options
| author | Neil Fuller <nfuller@google.com> | 2014-10-02 14:32:37 +0100 |
|---|---|---|
| committer | Neil Fuller <nfuller@google.com> | 2014-10-02 14:32:37 +0100 |
| commit | c2a0b4482d7144e8382346ea4c22c7b89368fec0 (patch) | |
| tree | f0ec3fbeee8dde1d56ad85c59d858ec093d5eb9d /tests/Camera2Tests | |
| parent | f08384c763d2e57c05e0be4325c267d12fc516d4 (diff) | |
| parent | ee665151a4c6359cbfbb9a6795aa9097c4622083 (diff) | |
| download | frameworks_base-c2a0b4482d7144e8382346ea4c22c7b89368fec0.zip frameworks_base-c2a0b4482d7144e8382346ea4c22c7b89368fec0.tar.gz frameworks_base-c2a0b4482d7144e8382346ea4c22c7b89368fec0.tar.bz2 | |
resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp
Change-Id: I2588c65b7a9fa43f968151a206924a804f0595a7
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(); |