Merge remote-tracking branch 'origin/1.3nsq' into 1.3nsq

chenshijun

2019-04-15 ad8ee0872802ba5d0194458bf215a6cc89f4d0d0

 QiaoJiaSystem/StructureApp/PerimeterElement.h

@@ -85,7 +85,12 @@


    int npts;
   std::vector<cv::Rect> m_recVec;
    std::vector<cv::Rect> m_recVec;

   //todo debug
    std::vector<float> m_scoreVec;
    std::vector<std::string> m_objTypeVec;


   bool m_bIsMask;
   std::vector<Point> poly1;