summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrupal Divvela <kdivvela@codeaurora.org>2015-07-21 19:54:47 +0530
committerSteve Kondik <steve@cyngn.com>2016-07-30 05:05:25 -0700
commitd3497e2d8dc8c1ea841be19474b12adbc28edfdf (patch)
tree94815ce90a7a3e19338e2f4c9a8968d0051cdeb5
parent61c3ce971cad7a41817eb4347ddb36eb220563fa (diff)
downloadandroid_packages_apps_Snap-d3497e2d8dc8c1ea841be19474b12adbc28edfdf.zip
android_packages_apps_Snap-d3497e2d8dc8c1ea841be19474b12adbc28edfdf.tar.gz
android_packages_apps_Snap-d3497e2d8dc8c1ea841be19474b12adbc28edfdf.tar.bz2
SnapdragonCamera: Fix FD roll_dir issue
Fix mouth position mismatch due to change sent due to wrong roll_dir. Change-Id: I5c3c4c8c74be6f055581656613a0703c596a42e5
-rw-r--r--src/com/android/camera/ui/FaceView.java18
1 files changed, 5 insertions, 13 deletions
diff --git a/src/com/android/camera/ui/FaceView.java b/src/com/android/camera/ui/FaceView.java
index 93c4fee..0bdf0de 100644
--- a/src/com/android/camera/ui/FaceView.java
+++ b/src/com/android/camera/ui/FaceView.java
@@ -352,25 +352,17 @@ public class FaceView extends View
Log.e(TAG, "smile: " + face.getSmileDegree() + "," +
face.getSmileScore());
if (face.getSmileDegree() < smile_threashold_no_smile) {
- if ((mDisplayRotation == 90) ||
- (mDisplayRotation == 270)) {
- point[0] = face.mouth.x + dx - delta_x;
- point[1] = face.mouth.y;
- point[2] = face.mouth.x + dx + delta_x;
- point[3] = face.mouth.y;
- } else {
- point[0] = face.mouth.x;
- point[1] = face.mouth.y + dy - delta_y;
- point[2] = face.mouth.x ;
- point[3] = face.mouth.y + dy + delta_y;
- }
+ point[0] = face.mouth.x + dx - delta_x;
+ point[1] = face.mouth.y;
+ point[2] = face.mouth.x + dx + delta_x;
+ point[3] = face.mouth.y;
+
Matrix faceMatrix = new Matrix(mMatrix);
faceMatrix.preRotate(face.getRollDirection(),
face.mouth.x, face.mouth.y);
faceMatrix.mapPoints(point);
canvas.drawLine(point[0] + dx, point[1] + dy,
point[2] + dx, point[3] + dy, mPaint);
-
} else if (face.getSmileDegree() <
smile_threashold_small_smile) {
int rotation_mouth = 360 - mDisplayRotation;