From 30ed50a1a66b3b53d1a777280182fd1ac1850bb2 Mon Sep 17 00:00:00 2001
From: chenshijun <chenshijun@aiotlink.com>
Date: 星期三, 08 九月 2021 17:58:20 +0800
Subject: [PATCH] ok
---
demo.cpp | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/demo.cpp b/demo.cpp
index d64c627..29242d6 100644
--- a/demo.cpp
+++ b/demo.cpp
@@ -48,7 +48,11 @@
for (int i=0; i<t_result->count; i++)
{
cout << "confidence:" << t_result->targets[i].confidence << endl;
+<<<<<<< HEAD
+ //draw_SDK_result(frame, t_result->targets[i]);
+=======
// draw_SDK_result(frame, t_result->targets[i]);
+>>>>>>> e47cdf6abec38e5249f5258bc7b98824b67eb79f
}
}else{
cout << "------------over--" << endl;
--
Gitblit v1.8.0