81c9fa1b by 乔峰昇

update OutputInfo

1 parent 9f65ab06
1 *.vscode
...\ No newline at end of file ...\ No newline at end of file
1 .vscode
2 build/
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -26,7 +26,7 @@ bool FaceComparison::init_model(string face_det_model,string face_landm_model,st ...@@ -26,7 +26,7 @@ bool FaceComparison::init_model(string face_det_model,string face_landm_model,st
26 } 26 }
27 } 27 }
28 28
29 int FaceComparison::inference(string image1_path,string image2_path,OutputInfo &output_info){ 29 int FaceComparison::inference(string image1_path,string image2_path,OutputInfo_FaceComparison &output_info){
30 bool result=false; 30 bool result=false;
31 cv::Mat image1=cv::imread(image1_path); 31 cv::Mat image1=cv::imread(image1_path);
32 cv::Mat image2=cv::imread(image2_path); 32 cv::Mat image2=cv::imread(image2_path);
...@@ -96,7 +96,7 @@ int FaceComparison::inference(string image1_path,string image2_path,OutputInfo & ...@@ -96,7 +96,7 @@ int FaceComparison::inference(string image1_path,string image2_path,OutputInfo &
96 return result; 96 return result;
97 } 97 }
98 98
99 int FaceComparison::inference(Mat image1,Mat image2,OutputInfo &output_info){ 99 int FaceComparison::inference(Mat image1,Mat image2,OutputInfo_FaceComparison &output_info){
100 if(image1.empty()){ 100 if(image1.empty()){
101 cout<<"Please check if the first picture path exists"<<endl; 101 cout<<"Please check if the first picture path exists"<<endl;
102 output_info.error_code=9001; 102 output_info.error_code=9001;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 #include "retinaface.h" 6 #include "retinaface.h"
7 #include "facelandmarks.h" 7 #include "facelandmarks.h"
8 8
9 struct OutputInfo{ 9 struct OutputInfo_FaceComparison{
10 int error_code; 10 int error_code;
11 bool result; 11 bool result;
12 }; 12 };
...@@ -34,8 +34,8 @@ class FaceComparison{ ...@@ -34,8 +34,8 @@ class FaceComparison{
34 34
35 35
36 //接口 36 //接口
37 int inference(string image_path1,string image_path2,OutputInfo &output_info); 37 int inference(string image_path1,string image_path2,OutputInfo_FaceComparison &output_info);
38 int inference(Mat image1,Mat image2,OutputInfo &output_info); 38 int inference(Mat image1,Mat image2,OutputInfo_FaceComparison &output_info);
39 39
40 private: 40 private:
41 RetinaFace face_det; 41 RetinaFace face_det;
......
...@@ -8,7 +8,7 @@ int main(){ ...@@ -8,7 +8,7 @@ int main(){
8 string face_rec_model = "/home/situ/qfs/sdk_project/mnn_projects/face_recognize_mnn/model/cls_face_mnn_1.0.0_v0.1.1.mnn"; 8 string face_rec_model = "/home/situ/qfs/sdk_project/mnn_projects/face_recognize_mnn/model/cls_face_mnn_1.0.0_v0.1.1.mnn";
9 9
10 InitModelError init_model_code; 10 InitModelError init_model_code;
11 OutputInfo output_info; 11 OutputInfo_FaceComparison output_info;
12 FaceComparison face_rec = FaceComparison(); 12 FaceComparison face_rec = FaceComparison();
13 bool init_ = face_rec.init_model(face_det_model,face_landm_model,face_rec_model,init_model_code); 13 bool init_ = face_rec.init_model(face_det_model,face_landm_model,face_rec_model,init_model_code);
14 if(init_){ 14 if(init_){
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!