summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTae-Young Chung <ty83.chung@samsung.com>2020-08-14 16:42:06 +0900
committerTae-Young Chung <ty83.chung@samsung.com>2020-08-18 09:07:43 +0900
commitb11ce83bdc7e1d6d771f8fe299bb51449809b795 (patch)
tree20ecd609670e0bd76ca517e684524eea3981f723
parenta4ff7e8d44d978aee53095d8f46be146239e7c7f (diff)
downloadmediavision-b11ce83bdc7e1d6d771f8fe299bb51449809b795.tar.gz
mediavision-b11ce83bdc7e1d6d771f8fe299bb51449809b795.tar.bz2
mediavision-b11ce83bdc7e1d6d771f8fe299bb51449809b795.zip
[Inference] Fix label type of mv_inference_landmark_s from char* to int
Change-Id: I1e88e884c164d402391c43214bf9d04d7a463715 Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>
-rw-r--r--include/mv_inference_private.h2
-rw-r--r--mv_inference/inference/src/Inference.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/include/mv_inference_private.h b/include/mv_inference_private.h
index 564bab80..81252834 100644
--- a/include/mv_inference_private.h
+++ b/include/mv_inference_private.h
@@ -37,7 +37,7 @@ extern "C" {
typedef struct {
bool isAvailable; /**< Availability of landmark */
mv_point_s point; /**< 2D position of landmark */
- const char *label; /**< Label of landmark */
+ int label; /**< Label of landmark */
float score; /**< Score of landmark */
} mv_inference_landmark_s;
diff --git a/mv_inference/inference/src/Inference.cpp b/mv_inference/inference/src/Inference.cpp
index fad2eecb..eb58c2bf 100644
--- a/mv_inference/inference/src/Inference.cpp
+++ b/mv_inference/inference/src/Inference.cpp
@@ -1442,7 +1442,7 @@ namespace inference
mPoseResult->landmarks[index].isAvailable = false;
mPoseResult->landmarks[index].point.x = -1;
mPoseResult->landmarks[index].point.y = -1;
- mPoseResult->landmarks[index].label = NULL;
+ mPoseResult->landmarks[index].label = -1;
mPoseResult->landmarks[index].score = -1.0f;
}
}
@@ -1472,7 +1472,7 @@ namespace inference
mPoseResult->landmarks[landmarkIndex].point.x = static_cast<int>(static_cast<float>(width) * loc2f.x);
mPoseResult->landmarks[landmarkIndex].point.y = static_cast<int>(static_cast<float>(height) * loc2f.y);
mPoseResult->landmarks[landmarkIndex].score = score;
- mPoseResult->landmarks[landmarkIndex].label = NULL;
+ mPoseResult->landmarks[landmarkIndex].label = -1;
}
}
mPoseResult->number_of_landmarks_per_pose = number_of_landmarks;