From 56f2bdb24bf13c345e7b238857c39bd2ea6a925a Mon Sep 17 00:00:00 2001
From: pans <pans@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 05 一月 2017 16:29:09 +0800
Subject: [PATCH]
---
RtspFace/demo/src/tools.h | 2 ++
RtspFace/demo/src/test.cpp | 5 +++--
RtspFace/demo/src/DBuntil.cpp | 19 ++++++++++++-------
RtspFace/demo/src/DBuntil.h | 14 ++++++++++----
RtspFace/demo/src/tools.cpp | 5 +++++
5 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/RtspFace/demo/src/DBuntil.cpp b/RtspFace/demo/src/DBuntil.cpp
index 027ace7..1c61e1a 100644
--- a/RtspFace/demo/src/DBuntil.cpp
+++ b/RtspFace/demo/src/DBuntil.cpp
@@ -3,15 +3,14 @@
#include <cstdio>
#include <iostream>
-
-MYSQL myCont;
-MYSQL_RES *result;
-MYSQL_ROW sql_row;
-
-DBuntil::DBuntil() {}
+DBuntil::DBuntil() {
+
+}
DBuntil::DBuntil(my_db mydb)
{
+ std::cout<<"DBuntil(my_db mydb) start"<<std::endl;
+
if(mysql_init(&myCont)!=NULL)
{
std::cout<<"init succeed"<<std::endl;
@@ -25,6 +24,8 @@
}
else
std::cout<<"mysql_real_connect failed"<<std::endl;
+
+ std::cout<<"DBuntil(my_db mydb) end"<<std::endl;
}
DBuntil::~DBuntil()
@@ -54,7 +55,11 @@
std::cout<<"per->f_id="<<per->f_id<<std::endl;
std::cout<<sql<<std::endl;
std::cout<<"==========end=============="<<std::endl;
- mysql_query(&myCont, "SET NAMES utf8"); //璁剧疆缂栫爜鏍煎紡
+ if(!mysql_query(&myCont, "SET NAMES utf8"))//璁剧疆缂栫爜鏍煎紡
+ {
+ std::cout<<"SET NAMES utf8"<<std::endl;
+ }else
+ std::cout<<"SET NAMES utf8 failed"<<std::endl;
res = mysql_query(&myCont,sql);//鏌ヨ
if (!res)
{
diff --git a/RtspFace/demo/src/DBuntil.h b/RtspFace/demo/src/DBuntil.h
index badd0b3..9585724 100644
--- a/RtspFace/demo/src/DBuntil.h
+++ b/RtspFace/demo/src/DBuntil.h
@@ -1,14 +1,16 @@
#ifndef _DBUNTIL_H_
#define _DBUNTIL_H_
-
-struct person {
+#include <mysql.h>
+struct person
+{
int p_id;
char *name;
int f_id;
//图片
};
-struct my_db {
+struct my_db
+{
char user[25];
char pswd[25];
char host[25];
@@ -23,10 +25,13 @@
DBuntil();
DBuntil(my_db mydb);
~DBuntil();
-
+
bool db_search(person *p);
bool db_register(person *p);
+ MYSQL myCont;
+ MYSQL_RES *result;
+ MYSQL_ROW sql_row;
private:
bool db_add(person *per);
@@ -35,6 +40,7 @@
char sql[1024];
int res;
+
};
#endif
\ No newline at end of file
diff --git a/RtspFace/demo/src/test.cpp b/RtspFace/demo/src/test.cpp
index e40537b..af8c4b1 100644
--- a/RtspFace/demo/src/test.cpp
+++ b/RtspFace/demo/src/test.cpp
@@ -15,7 +15,7 @@
char *image_list = "../test_image/imglist";
- person *p={0,"axsdcc"};
+ person p={0,"axsdcc",1};
cv::Mat bgr_image = cv::imread(image_path);
if(bgr_image.data != NULL) {
@@ -27,8 +27,9 @@
int idx = -11;
tools tool=tools();
+ cout<<"======tools==========="<<endl;
//idx=tool.reg(bgr_image,&p);
- tool.search(bgr_image,p);
+ tool.search(bgr_image,&p);
cout<<"============================================"<<endl;
cout<<"p_id="<<p.p_id<<endl;
cout<<"name="<<p.name<<endl;
diff --git a/RtspFace/demo/src/tools.cpp b/RtspFace/demo/src/tools.cpp
index 5f82a83..7fb3e33 100644
--- a/RtspFace/demo/src/tools.cpp
+++ b/RtspFace/demo/src/tools.cpp
@@ -2,9 +2,11 @@
tools::tools()
{
+ std::cout<<"tools() start"<<std::endl;
my_db mydb= {"root","Basic@2017","localhost","demo",3306};
dbu = DBuntil(mydb);
+ std::cout<<"tools() end"<<std::endl;
}
tools::~tools() {}
@@ -51,6 +53,9 @@
int tools::do_search(person *p)
{
+ //if(dbu.myCont == NULL){
+ // std::cout<<"myCont is null"<<std::endl;
+ //}
dbu.db_search(p);
if(p->p_id != NULL)
{
diff --git a/RtspFace/demo/src/tools.h b/RtspFace/demo/src/tools.h
index de24907..1d263aa 100644
--- a/RtspFace/demo/src/tools.h
+++ b/RtspFace/demo/src/tools.h
@@ -12,12 +12,14 @@
int search(cv::Mat image,person *p);
int search(char* s_feature,person *p);
int reg(cv::Mat image,person *p);
+
private:
int do_register(cv::Mat image,person *p);
int do_search(person *p);
person per;
DBuntil dbu;
faceAPI f_api;
+
};
#endif
\ No newline at end of file
--
Gitblit v1.8.0