From 1095b9b8673b15039363b76c7006af40fecc358e Mon Sep 17 00:00:00 2001 From: Andrew Harp Date: Fri, 6 Jan 2017 16:09:43 -0800 Subject: [PATCH] Android: Ignore the return value of Matrix.mapRect(), as it cannot always be trusted; there's no reason for it to legitimately ever be false in the demo anyway. Change: 143827418 --- .../demo/tracking/MultiBoxTracker.java | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/tensorflow/examples/android/src/org/tensorflow/demo/tracking/MultiBoxTracker.java b/tensorflow/examples/android/src/org/tensorflow/demo/tracking/MultiBoxTracker.java index 8e1b7aaf8e2..49c91d600da 100644 --- a/tensorflow/examples/android/src/org/tensorflow/demo/tracking/MultiBoxTracker.java +++ b/tensorflow/examples/android/src/org/tensorflow/demo/tracking/MultiBoxTracker.java @@ -167,24 +167,21 @@ public class MultiBoxTracker { (int) (multiplier * frameWidth), sensorOrientation, false); - for (final TrackedRecognition recognition : trackedObjects) { final ObjectTracker.TrackedObject trackedObject = recognition.trackedObject; final RectF trackedPos = trackedObject.getTrackedPositionInPreviewFrame(); + getFrameToCanvasMatrix().mapRect(trackedPos); + boxPaint.setColor(recognition.color); - if (getFrameToCanvasMatrix().mapRect(trackedPos)) { - boxPaint.setColor(recognition.color); + final float cornerSize = Math.min(trackedPos.width(), trackedPos.height()) / 8.0f; + canvas.drawRoundRect(trackedPos, cornerSize, cornerSize, boxPaint); - final float cornerSize = Math.min(trackedPos.width(), trackedPos.height()) / 8.0f; - canvas.drawRoundRect(trackedPos, cornerSize, cornerSize, boxPaint); - - final String labelString = - !TextUtils.isEmpty(recognition.title) - ? String.format("%s %.2f", recognition.title, recognition.detectionConfidence) - : String.format("%.2f", recognition.detectionConfidence); - borderedText.drawText(canvas, trackedPos.left + cornerSize, trackedPos.bottom, labelString); - } + final String labelString = + !TextUtils.isEmpty(recognition.title) + ? String.format("%s %.2f", recognition.title, recognition.detectionConfidence) + : String.format("%.2f", recognition.detectionConfidence); + borderedText.drawText(canvas, trackedPos.left + cornerSize, trackedPos.bottom, labelString); } }