From 1e7e2ba704be9ba78f1c50ecc637212414706b82 Mon Sep 17 00:00:00 2001
From: pans <pans@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 30 十二月 2016 10:27:05 +0800
Subject: [PATCH] 

---
 RtspFace/demo/src/faceAPI.cpp |   39 +++++++++++++++++++++++----------------
 1 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/RtspFace/demo/src/faceAPI.cpp b/RtspFace/demo/src/faceAPI.cpp
index 68b0114..c65f15a 100644
--- a/RtspFace/demo/src/faceAPI.cpp
+++ b/RtspFace/demo/src/faceAPI.cpp
@@ -2,40 +2,44 @@
 #include "faceDB.h"
 
 faceDB *fdb;
-faceAPI::faceAPI(){
+faceAPI::faceAPI()
+{
 	//鍒涘缓闈欐�佷汉鑴歌瘑鍒彞鏌勶紝鍚屾椂鍒涘缓鐘舵�佹爣閲�
 	cv_result_t cv_result = 0;
-	
+
 	//faceDB* f_db = faceDB.GetInstance();
 	fdb=new faceDB();
 }
 
-faceAPI::~faceAPI(){
+faceAPI::~faceAPI()
+{
 
 }
 
-int faceAPI::do_reasch(cv::Mat image){
+int faceAPI::do_reasch(cv::Mat image)
+{
 	if (!image.data) {
 		fprintf(stderr, "fail to read img\n");
 		return -1;
-	}else
+	} else
 		fprintf(stderr, "read img\n");
 	p_f = fdb->extract_feature(image);
 	fprintf(stderr, "fdb->extract_feature(image)\n");
-	if (!p_f)
-	{
+	if (!p_f) {
 		fprintf(stderr, "p_f is null\n");
 		return -2;
 	}
-	return p_img_search(p_f); 
+	return p_img_search(p_f);
 }
 
-int faceAPI::do_reasch(char* s_feature){
+int faceAPI::do_reasch(char* s_feature)
+{
 	get_feature(s_feature,p_f);
 	return p_img_search(p_f);
 }
 
-int faceAPI::do_register(cv::Mat image){
+int faceAPI::do_register(cv::Mat image)
+{
 	p_f = fdb->extract_feature(image);
 	//db add
 	int indx = 1;
@@ -43,16 +47,18 @@
 }
 
 
-int faceAPI::p_img_search(cv_feature_t *p_feature){
+int faceAPI::p_img_search(cv_feature_t *p_feature)
+{
 	std::cout<<"p img search"<<std::endl;
-	
+
 	return fdb->search_db(p_feature);
 }
 
 //@brief 鐗瑰緛鍊艰浆鎹负瀛楃涓�
 //@param 鐗瑰緛鍊�
 //@return 瀛楃涓叉牸寮忕殑鐗瑰緛鍊�
-int faceAPI::get_char(cv_feature_t *p_feature,char* feature_str){
+int faceAPI::get_char(cv_feature_t *p_feature,char* feature_str)
+{
 
 	return cv_verify_serialize_feature(p_feature,feature_str);
 }
@@ -60,11 +66,12 @@
 //@brief 瀛楃涓茶浆鎹负鐗瑰緛鍊�
 //@param 瀛楃涓叉牸寮忕殑鐗瑰緛鍊�
 //@return 鐗瑰緛鍊�
-int faceAPI::get_feature(char *feature_str,cv_feature_t *p_feature){
+int faceAPI::get_feature(char *feature_str,cv_feature_t *p_feature)
+{
 
 	p_feature = cv_verify_deserialize_feature(feature_str);
-	if(p_feature != NULL){
+	if(p_feature != NULL) {
 		return 0;
-	}else
+	} else
 		return -1;
 }
\ No newline at end of file

--
Gitblit v1.8.0