From 4e0283736988369f9924f8436c8bdfc915673573 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 13 一月 2020 12:40:30 +0800
Subject: [PATCH] debug
---
csrc/buz/face/property.h | 2 +-
cface.h | 2 +-
csrc/buz/face/extractor.h | 2 +-
csrc/buz/face/extractor.cpp | 2 +-
csrc/buz/base.hpp | 0
csrc/buz/face/property.cpp | 2 +-
csrc/buz/face/detector.h | 2 +-
csrc/buz/face/tracker.cpp | 0
csrc/buz/face/detector.cpp | 2 +-
csrc/buz/face/tracker.h | 2 +-
csdk_struct.h | 20 ++++++++++----------
csrc/all.hpp | 8 ++++----
12 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/cface.h b/cface.h
index 41a2788..c1d0076 100644
--- a/cface.h
+++ b/cface.h
@@ -5,7 +5,7 @@
extern "C"{
#endif
-#include "csrc/struct.h"
+#include "csdk_struct.h"
#ifndef uchar
typedef unsigned char uchar;
diff --git a/csrc/struct.h b/csdk_struct.h
similarity index 97%
rename from csrc/struct.h
rename to csdk_struct.h
index 951ab42..e733027 100644
--- a/csrc/struct.h
+++ b/csdk_struct.h
@@ -1,34 +1,34 @@
#ifndef _c_wrapper_c_structure_h_
#define _c_wrapper_c_structure_h_
-
+
#include <string.h>
-
+
typedef struct _cPOINT {
int x;
int y;
} cPOINT;
-
+
typedef struct _cRECT {
int left;
int top;
int right;
int bottom;
} cRECT;
-
+
typedef struct _cIMAGE{
unsigned char *data;
int width;
int height;
int channel;
} cIMAGE;
-
+
typedef struct _cFaceAngle {
int yaw;
int pitch;
int roll;
float confidence;
} cFaceAngle;
-
+
typedef struct _cThftResult {
int gender;//1-male,0-female
int age;//range[0-100]
@@ -36,7 +36,7 @@
int beauty_level;//range[0-100]
int smile_level;//range[0-100]
} cThftResult;
-
+
typedef struct _cFacePos {
cRECT rcFace;
cPOINT ptLeftEye;
@@ -48,7 +48,7 @@
unsigned char pFacialData[512];
} cFacePos;
-
+
typedef struct _cFaceInfo{
cRECT rcFace;
cPOINT ptLeftEye;
@@ -61,6 +61,6 @@
unsigned char pFacialData[8*1024];
long nFaceID;//face tracking id
} cFaceInfo;
-
-
+
+
#endif
\ No newline at end of file
diff --git a/csrc/all.hpp b/csrc/all.hpp
index 301e046..bbe31af 100644
--- a/csrc/all.hpp
+++ b/csrc/all.hpp
@@ -1,9 +1,9 @@
#ifndef _c_wrapper_face_detector_all_hpp_
#define _c_wrapper_face_detector_all_hpp_
-#include "detector.cpp"
-#include "extractor.cpp"
-#include "property.cpp"
-#include "tracker.cpp"
+#include "buz/face/detector.cpp"
+#include "buz/face/extractor.cpp"
+#include "buz/face/property.cpp"
+#include "buz/face/tracker.cpp"
#endif
\ No newline at end of file
diff --git a/csrc/base.hpp b/csrc/buz/base.hpp
similarity index 100%
rename from csrc/base.hpp
rename to csrc/buz/base.hpp
diff --git a/csrc/detector.cpp b/csrc/buz/face/detector.cpp
similarity index 98%
rename from csrc/detector.cpp
rename to csrc/buz/face/detector.cpp
index 201c3b4..e191ea8 100644
--- a/csrc/detector.cpp
+++ b/csrc/buz/face/detector.cpp
@@ -6,7 +6,7 @@
#include "THFaceImage_i.h"
-#include "struct.h"
+#include "csdk_struct.h"
namespace csdk_wrap
{
diff --git a/csrc/detector.h b/csrc/buz/face/detector.h
similarity index 93%
rename from csrc/detector.h
rename to csrc/buz/face/detector.h
index fbd5418..8a4497d 100644
--- a/csrc/detector.h
+++ b/csrc/buz/face/detector.h
@@ -1,7 +1,7 @@
#ifndef _c_wrapper_face_detector_hpp_
#define _c_wrapper_face_detector_hpp_
-#include "base.hpp"
+#include "../base.hpp"
struct _cFacePos;
diff --git a/csrc/extractor.cpp b/csrc/buz/face/extractor.cpp
similarity index 97%
rename from csrc/extractor.cpp
rename to csrc/buz/face/extractor.cpp
index b50a68f..594eb1f 100644
--- a/csrc/extractor.cpp
+++ b/csrc/buz/face/extractor.cpp
@@ -1,7 +1,7 @@
#include "extractor.h"
#include "THFeature_i.h"
-#include "struct.h"
+#include "csdk_struct.h"
namespace csdk_wrap{
diff --git a/csrc/extractor.h b/csrc/buz/face/extractor.h
similarity index 94%
rename from csrc/extractor.h
rename to csrc/buz/face/extractor.h
index eb7a016..31bb712 100644
--- a/csrc/extractor.h
+++ b/csrc/buz/face/extractor.h
@@ -1,7 +1,7 @@
#ifndef _c_wrapper_face_extractor_h_
#define _c_wrapper_face_extractor_h_
-#include "base.hpp"
+#include "../base.hpp"
struct _cFacePos;
struct _cIMAGE;
diff --git a/csrc/property.cpp b/csrc/buz/face/property.cpp
similarity index 97%
rename from csrc/property.cpp
rename to csrc/buz/face/property.cpp
index ee13a17..74d4774 100644
--- a/csrc/property.cpp
+++ b/csrc/buz/face/property.cpp
@@ -1,7 +1,7 @@
#include "property.h"
#include "THFaceProperty_i.h"
-#include "struct.h"
+#include "csdk_struct.h"
namespace csdk_wrap{
diff --git a/csrc/property.h b/csrc/buz/face/property.h
similarity index 92%
rename from csrc/property.h
rename to csrc/buz/face/property.h
index 23f2ed7..39d3976 100644
--- a/csrc/property.h
+++ b/csrc/buz/face/property.h
@@ -1,7 +1,7 @@
#ifndef _c_wrapper_face_property_h_
#define _c_wrapper_face_property_h_
-#include "base.hpp"
+#include "../base.hpp"
struct _cThftResult;
struct _cFacePos;
diff --git a/csrc/tracker.cpp b/csrc/buz/face/tracker.cpp
similarity index 100%
rename from csrc/tracker.cpp
rename to csrc/buz/face/tracker.cpp
diff --git a/csrc/tracker.h b/csrc/buz/face/tracker.h
similarity index 96%
rename from csrc/tracker.h
rename to csrc/buz/face/tracker.h
index 362d201..6498bc9 100644
--- a/csrc/tracker.h
+++ b/csrc/buz/face/tracker.h
@@ -1,7 +1,7 @@
#ifndef _c_wrapper_face_tracker_h_
#define _c_wrapper_face_tracker_h_
-#include "base.hpp"
+#include "../base.hpp"
struct _cRECT;
struct _cFaceInfo;
--
Gitblit v1.8.0