From 7002c58acbe6e1470b6e15adea573f938663ff03 Mon Sep 17 00:00:00 2001
From: pans <pans@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 04 一月 2017 17:03:03 +0800
Subject: [PATCH]
---
RtspFace/demo/src/tools.h | 4 ++--
RtspFace/demo/src/test.cpp | 2 +-
RtspFace/demo/src/DBuntil.cpp | 4 ++--
RtspFace/demo/src/DBuntil.h | 2 +-
RtspFace/demo/src/db/DBuntil.cpp | 4 ++--
RtspFace/demo/src/tools.cpp | 17 ++++++++---------
6 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/RtspFace/demo/src/DBuntil.cpp b/RtspFace/demo/src/DBuntil.cpp
index b9c4d94..27a2c76 100644
--- a/RtspFace/demo/src/DBuntil.cpp
+++ b/RtspFace/demo/src/DBuntil.cpp
@@ -35,12 +35,12 @@
mysql_close(&myCont);
}
-person DBuntil::db_rearch(int f_id)
+*person DBuntil::db_rearch(int f_id)
{
person p= {0,""};
db_select(f_id,&p);
//瀵圭粨鏋勪綋璧嬪��
- return p;
+ return &p;
}
bool DBuntil::db_select(int f_id,person* per)
diff --git a/RtspFace/demo/src/DBuntil.h b/RtspFace/demo/src/DBuntil.h
index 337b371..5b18ce6 100644
--- a/RtspFace/demo/src/DBuntil.h
+++ b/RtspFace/demo/src/DBuntil.h
@@ -23,7 +23,7 @@
DBuntil();
DBuntil(my_db mydb);
~DBuntil();
- person db_rearch(int f_id);
+ *person db_rearch(int f_id);
bool db_register(int f_id,person *p);
diff --git a/RtspFace/demo/src/db/DBuntil.cpp b/RtspFace/demo/src/db/DBuntil.cpp
index b9c4d94..27a2c76 100644
--- a/RtspFace/demo/src/db/DBuntil.cpp
+++ b/RtspFace/demo/src/db/DBuntil.cpp
@@ -35,12 +35,12 @@
mysql_close(&myCont);
}
-person DBuntil::db_rearch(int f_id)
+*person DBuntil::db_rearch(int f_id)
{
person p= {0,""};
db_select(f_id,&p);
//瀵圭粨鏋勪綋璧嬪��
- return p;
+ return &p;
}
bool DBuntil::db_select(int f_id,person* per)
diff --git a/RtspFace/demo/src/test.cpp b/RtspFace/demo/src/test.cpp
index 05eab0d..135b3a8 100644
--- a/RtspFace/demo/src/test.cpp
+++ b/RtspFace/demo/src/test.cpp
@@ -27,7 +27,7 @@
int idx = -11;
tools tool=tools();
- idx=tool->register(bgr_image,p);
+ idx=tool->reg(bgr_image,p);
cout<<"idx="<<idx<<endl;
diff --git a/RtspFace/demo/src/tools.cpp b/RtspFace/demo/src/tools.cpp
index 42c1515..ac85d55 100644
--- a/RtspFace/demo/src/tools.cpp
+++ b/RtspFace/demo/src/tools.cpp
@@ -10,10 +10,10 @@
int tools::search(cv::Mat image,person *p)
{
- idx = f_api->do_reasch(image);
+ idx = f_api.do_reasch(image);
if(idx<0)
{
- p = dbu->db_rearch(int);
+ p = dbu.db_rearch(idx);
if(p != NULL)
{
return 0;
@@ -24,10 +24,10 @@
int tools::search(char* s_feature,person *p)
{
- idx = f_api->do_reasch(s_feature);
+ idx = f_api.do_reasch(s_feature);
if(idx<0)
{
- p = db_rearch(int);
+ p = dbu.db_rearch(idx);
if(p != NULL)
{
return 0;
@@ -36,7 +36,7 @@
return -1;
}
-int tools::register(cv::Mat image,person *p)
+int tools::reg(cv::Mat image,person *p)
{
if(do_register(image,p) == 0){
return 0;
@@ -47,18 +47,17 @@
person tools::do_search(int idx)
{
person p;
- p = dbu->db_rearch(int);
+ p = dbu.db_rearch(idx);
return p;
}
int tools::do_register(cv::Mat image,person *p)
{
- idx = f_api->do_register(image);
+ idx = f_api.do_register(image);
if(idx<0)
{
p->f_id = idx;
- idx = dbu->do_register(idx,p);
- if(idx)
+ if(dbu.db_register(idx,p))
{
return 0;
}
diff --git a/RtspFace/demo/src/tools.h b/RtspFace/demo/src/tools.h
index e69692f..6b76ae1 100644
--- a/RtspFace/demo/src/tools.h
+++ b/RtspFace/demo/src/tools.h
@@ -11,13 +11,13 @@
~tools();
int search(cv::Mat image,person *p);
int search(char* s_feature,person *p);
- int register(cv::Mat image,person *p);
+ int reg(cv::Mat image,person *p);
private:
int do_register(cv::Mat image,person *p);
person do_search(int idx);
int idx;
DBuntil dbu;
faceAPI f_api;
-}
+};
#endif
\ No newline at end of file
--
Gitblit v1.8.0