Merge branch 'master' into Develop

pansen

2019-01-04 a9e9e90b0c0a8fa7f0b78b29101a3dc13a021a5d

 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);
   }
}