Merge remote-tracking branch 'origin/feature_addPersonTracking' into featur...

pansen

2018-12-26 4001288af80a5e07bb96dd2a7d41d7cb0052a560

 QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.cpp

@@ -58,6 +58,7 @@
                memcpy(&face, &pos, sizeof(pos) - sizeof(pos.pFacialData));
                face.pFacialData.resize(sizeof(pos.pFacialData));
                memcpy(face.pFacialData.data(), pos.pFacialData, sizeof(pos.pFacialData));
                face.pfaceId = -1;
//                DBG(face.fAngle.confidence);
                faces.push_back(face);
            }