From 0a762a217fe499b7b63d55ed4b46dde1afd49f28 Mon Sep 17 00:00:00 2001
From: pans <pansen626@sina.com>
Date: 星期一, 15 四月 2019 16:57:06 +0800
Subject: [PATCH] .3nsq: Auto stash before merge of "1.3nsq" and "origin/1.3nsq"
---
QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.h | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.h b/QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.h
index dfb93d3..09dfe1a 100644
--- a/QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.h
+++ b/QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.h
@@ -20,6 +20,9 @@
// FaceDetectServer interface
public:
virtual FaceDetect::ThftResult faceProperty(Ice::Int, Ice::Int, const FaceDetect::FacePos &, const std::string &, const Ice::Current &) override;
+
+private:
+ int m_ampleSize;
};
--
Gitblit v1.8.0