Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ i...

pansen

2019-03-15 c64a4f19a0a41b62917eb1dc8b0789c9ddf6baab

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