From 0436e5443295395025f89f0d091aab1e9551d1a4 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 10 一月 2019 20:26:31 +0800
Subject: [PATCH] Merge branch 'ywv1.2' of ssh://192.168.1.226:29418/development/c++ into ywv1.2
---
QiaoJiaSystem/FaceDetectServer/rpc/FaceServer.ice | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/FaceDetectServer/rpc/FaceServer.ice b/QiaoJiaSystem/FaceDetectServer/rpc/FaceServer.ice
index 0147bcf..04743fc 100644
--- a/QiaoJiaSystem/FaceDetectServer/rpc/FaceServer.ice
+++ b/QiaoJiaSystem/FaceDetectServer/rpc/FaceServer.ice
@@ -43,6 +43,7 @@
FaceAngle fAngle;
int nQuality;
Data pFacialData;
+ long pfaceId;
}
sequence<FacePos> Faces;
@@ -56,6 +57,6 @@
interface FaceExtractServer
{
Data faceExtract(int width, int height, FacePos pos, string shareMemory);
- Data faceExtract(Data jpgImage);
+ //Data faceExtract(Data jpgImage);
}
}
\ No newline at end of file
--
Gitblit v1.8.0