diff options
| author | zhuw <zhuw@codeaurora.org> | 2018-03-13 17:18:54 +0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-03-13 02:20:57 -0700 |
| commit | 389dfa85eda510a15adda60950abd44c8625e630 (patch) | |
| tree | 4d3fcd14e9e89cca41bbfff01addcfe2c8f78260 /src/com/android/camera/ui | |
| parent | d84226ae44f49499c732166df3aacfaa287e1caf (diff) | |
| download | android_packages_apps_Snap-389dfa85eda510a15adda60950abd44c8625e630.tar.gz android_packages_apps_Snap-389dfa85eda510a15adda60950abd44c8625e630.tar.bz2 android_packages_apps_Snap-389dfa85eda510a15adda60950abd44c8625e630.zip | |
Fix FD rect out of bound issue
when FD rect is out of bound, don't show face circle
Change-Id: I2205f00aed7e6b27dd04a85f6dc5abe5f3c9629d
Diffstat (limited to 'src/com/android/camera/ui')
| -rw-r--r-- | src/com/android/camera/ui/Camera2FaceView.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/camera/ui/Camera2FaceView.java b/src/com/android/camera/ui/Camera2FaceView.java index f815a7c20..fa4b3e88a 100644 --- a/src/com/android/camera/ui/Camera2FaceView.java +++ b/src/com/android/camera/ui/Camera2FaceView.java @@ -110,6 +110,11 @@ public class Camera2FaceView extends FaceView { } } + private boolean isFDRectOutOfBound(Rect faceRect) { + return mCameraBound.left > faceRect.left || mCameraBound.top > faceRect.top || + faceRect.right > mCameraBound.right || faceRect.bottom > mCameraBound.bottom; + } + @Override public boolean faceExists() { return (mFaces != null && mFaces.length > 0); @@ -168,6 +173,7 @@ public class Camera2FaceView extends FaceView { if (mFaces[i].getScore() < 50) continue; Rect faceBound = mFaces[i].getBounds(); faceBound.offset(-mOriginalCameraBound.left, -mOriginalCameraBound.top); + if (isFDRectOutOfBound(faceBound)) continue; mRect.set(faceBound); if (mZoom != 1.0f) { mRect.left = mRect.left - mCameraBound.left; |