From ec2419856b3ad424bf5ee61a4a6614f8e32f3471 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 19 十二月 2018 09:42:53 +0800
Subject: [PATCH] change ice file
---
QiaoJiaSystem/FaceDetectServer/rpc/FaceServer.ice | 3 ++-
QiaoJiaSystem/FaceDetectServer/rpc/FaceServer.h | 14 +++++++++-----
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/QiaoJiaSystem/FaceDetectServer/rpc/FaceServer.h b/QiaoJiaSystem/FaceDetectServer/rpc/FaceServer.h
index b0752ee..5b8307c 100644
--- a/QiaoJiaSystem/FaceDetectServer/rpc/FaceServer.h
+++ b/QiaoJiaSystem/FaceDetectServer/rpc/FaceServer.h
@@ -129,10 +129,11 @@
::FaceDetect::FaceAngle fAngle;
int nQuality;
::FaceDetect::Data pFacialData;
+ long long int pfaceId;
- std::tuple<const ::FaceDetect::RECT&, const ::FaceDetect::POINT&, const ::FaceDetect::POINT&, const ::FaceDetect::POINT&, const ::FaceDetect::POINT&, const ::FaceDetect::FaceAngle&, const int&, const ::FaceDetect::Data&> ice_tuple() const
+ std::tuple<const ::FaceDetect::RECT&, const ::FaceDetect::POINT&, const ::FaceDetect::POINT&, const ::FaceDetect::POINT&, const ::FaceDetect::POINT&, const ::FaceDetect::FaceAngle&, const int&, const ::FaceDetect::Data&, const long long int&> ice_tuple() const
{
- return std::tie(rcFace, ptLeftEye, ptRightEye, ptMouth, ptNose, fAngle, nQuality, pFacialData);
+ return std::tie(rcFace, ptLeftEye, ptRightEye, ptMouth, ptNose, fAngle, nQuality, pFacialData, pfaceId);
}
};
@@ -371,7 +372,7 @@
struct StreamableTraits<::FaceDetect::FacePos>
{
static const StreamHelperCategory helper = StreamHelperCategoryStruct;
- static const int minWireSize = 69;
+ static const int minWireSize = 77;
static const bool fixedLength = false;
};
@@ -380,7 +381,7 @@
{
static void read(S* istr, ::FaceDetect::FacePos& v)
{
- istr->readAll(v.rcFace, v.ptLeftEye, v.ptRightEye, v.ptMouth, v.ptNose, v.fAngle, v.nQuality, v.pFacialData);
+ istr->readAll(v.rcFace, v.ptLeftEye, v.ptRightEye, v.ptMouth, v.ptNose, v.fAngle, v.nQuality, v.pFacialData, v.pfaceId);
}
};
@@ -719,6 +720,7 @@
::FaceDetect::FaceAngle fAngle;
::Ice::Int nQuality;
::FaceDetect::Data pFacialData;
+ ::Ice::Long pfaceId;
};
typedef ::std::vector< ::FaceDetect::FacePos> Faces;
@@ -1098,7 +1100,7 @@
struct StreamableTraits< ::FaceDetect::FacePos>
{
static const StreamHelperCategory helper = StreamHelperCategoryStruct;
- static const int minWireSize = 69;
+ static const int minWireSize = 77;
static const bool fixedLength = false;
};
@@ -1115,6 +1117,7 @@
ostr->write(v.fAngle);
ostr->write(v.nQuality);
ostr->write(v.pFacialData);
+ ostr->write(v.pfaceId);
}
};
@@ -1131,6 +1134,7 @@
istr->read(v.fAngle);
istr->read(v.nQuality);
istr->read(v.pFacialData);
+ istr->read(v.pfaceId);
}
};
diff --git a/QiaoJiaSystem/FaceDetectServer/rpc/FaceServer.ice b/QiaoJiaSystem/FaceDetectServer/rpc/FaceServer.ice
index 0147bcf..5d04641 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