From 332d18eb6733a5400a2cfd3a3faa2e056bd2a02c Mon Sep 17 00:00:00 2001
From: pans <pans@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 04 一月 2017 19:07:05 +0800
Subject: [PATCH]
---
RtspFace/demo/src/tools.cpp | 45 +++++++++++++++++++++++++--------------------
1 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/RtspFace/demo/src/tools.cpp b/RtspFace/demo/src/tools.cpp
index ac85d55..1cce90d 100644
--- a/RtspFace/demo/src/tools.cpp
+++ b/RtspFace/demo/src/tools.cpp
@@ -1,8 +1,9 @@
#include "tools.h"
-tools::tools() {
- my_db mydb={"root","Basic@2017","localhost","demo",3306};
-
+tools::tools()
+{
+ my_db mydb= {"root","Basic@2017","localhost","demo",3306};
+
dbu = DBuntil(mydb);
}
@@ -10,11 +11,11 @@
int tools::search(cv::Mat image,person *p)
{
- idx = f_api.do_reasch(image);
- if(idx<0)
+ p={};
+ p->f_id = f_api.do_reasch(image);
+ if(p->f_id < 0)
{
- p = dbu.db_rearch(idx);
- if(p != NULL)
+ if(do_search(p) == 0)
{
return 0;
}
@@ -24,11 +25,11 @@
int tools::search(char* s_feature,person *p)
{
- idx = f_api.do_reasch(s_feature);
- if(idx<0)
+ p={};
+ p->f_id = f_api.do_reasch(s_feature);
+ if(p->f_id < 0)
{
- p = dbu.db_rearch(idx);
- if(p != NULL)
+ if(do_search(p) == 0)
{
return 0;
}
@@ -38,26 +39,30 @@
int tools::reg(cv::Mat image,person *p)
{
- if(do_register(image,p) == 0){
+ if(do_register(image,p) == 0)
+ {
return 0;
}
return -1;
}
-person tools::do_search(int idx)
+int tools::do_search(person *p)
{
- person p;
- p = dbu.db_rearch(idx);
- return p;
+ dbu.db_search(p);
+ if(p->p_id != NULL)
+ {
+ return 0;
+ }
+ return -1;
}
int tools::do_register(cv::Mat image,person *p)
{
- idx = f_api.do_register(image);
- if(idx<0)
+ p={};
+ p->f_id = f_api.do_register(image);
+ if(p->f_id < 0)
{
- p->f_id = idx;
- if(dbu.db_register(idx,p))
+ if(dbu.db_register(p))
{
return 0;
}
--
Gitblit v1.8.0