[Release] capi-media-vision-0.6.0-3 accepted/tizen/unified/20200820.133523 submit/tizen/20200820.044303
authorTae-Young Chung <ty83.chung@samsung.com>
Thu, 20 Aug 2020 04:40:21 +0000 (13:40 +0900)
committerTae-Young Chung <ty83.chung@samsung.com>
Thu, 20 Aug 2020 04:40:48 +0000 (13:40 +0900)
Merge branch 'tizen_devel' into tizen

1  2 
mv_inference/inference/src/Posture.cpp
mv_inference/inference/src/mv_inference_open.cpp

@@@ -38,9 -38,9 +38,10 @@@ Posture::Posture() 
      LOGI("ENTER");
  
      mMotionToPoseMap.clear();
-     mPose.assign(POSE_MAX_LANDMARKS, std::make_pair(false, cv::Point(-1,-1)));
+     mPose.assign(HUMAN_POSE_MAX_LANDMARKS, std::make_pair(false, cv::Point(-1,-1)));
+     mPoseParts.assign(HUMAN_POSE_MAX_PARTS, std::make_pair(false, std::vector<cv::Vec2f>()));
 +
-     mPoseParts.assign(POSE_MAX_PARTS, std::make_pair(false, std::vector<cv::Vec2f>()));
      LOGI("LEAVE");
  }
  
@@@ -170,6 -170,8 +171,10 @@@ int Posture::setPoseFromFile(const std:
      mMotionToPoseMap.clear();
      while (!fp.eof()) {
          std::getline(fp, line);
++
+         if (line.empty())
+             continue;
++
          LOGD("%s", line.c_str());
          std::istringstream lineStream(line);
          std::string token;
@@@ -960,7 -962,7 +962,8 @@@ int mv_pose_compare_open(mv_pose_h pose
        std::vector<std::pair<bool, cv::Point>> actionParts;
  
        mv_inference_pose_s *pAction = static_cast<mv_inference_pose_s *>(action);
-       for (int k = 0; k < POSE_MAX_LANDMARKS; ++k) {
++
+       for (int k = 0; k < HUMAN_POSE_MAX_LANDMARKS; ++k) {
                if (pAction->landmarks[k].point.x == -1 || pAction->landmarks[k].point.y == -1) {
                        actionParts.push_back(std::make_pair(false, cv::Point(-1,-1)));
                        continue;