fix build error due to Mediavision ACR

Fix build error due to Mediavision ACR.
Recently, Mediavision API has been changed so Mediavision backend
of SingleO framework should be updated.

Change-Id: Icba1b75f0bf0bc06440db38ea9c1d890836f4f8f
Signed-off-by: Inki Dae <inki.dae@samsung.com>

diff --git a/inference/backends/mediavision/include/MvFaceDetection.h b/inference/backends/mediavision/include/MvFaceDetection.h
index c09922a8210e0ba20350bb050a2dd5fb6eff00b8..aec192c74b997cf8e2dd406e468cc91a2d638e92 100644 (file)
--- a/inference/backends/mediavision/include/MvFaceDetection.h
+++ b/inference/backends/mediavision/include/MvFaceDetection.h
@@ -18,6 +18,7 @@
 #define __MV_FACE_DETECTION_H__
 
 #include "IInferenceTaskInterface.h"
+#include "mv_face_detection.h"
 #include "mv_face_detection_internal.h"
 #include "SingleoCommonTypes.h"
 

diff --git a/inference/backends/mediavision/include/MvFaceLandmark.h b/inference/backends/mediavision/include/MvFaceLandmark.h
index 873f8d66fc5374e7495d4e9657afcfc26e6fa042..18d8af72ee7aeb6e2e6b170d024bd9cbaa84c352 100644 (file)
--- a/inference/backends/mediavision/include/MvFaceLandmark.h
+++ b/inference/backends/mediavision/include/MvFaceLandmark.h
@@ -18,6 +18,7 @@
 #define __MV_FACE_LANDMARK_H__
 
 #include "IInferenceTaskInterface.h"
+#include "mv_facial_landmark.h"
 #include "mv_facial_landmark_internal.h"
 #include "SingleoCommonTypes.h"
 

diff --git a/inference/backends/mediavision/include/MvImageClassification.h b/inference/backends/mediavision/include/MvImageClassification.h
index 87441180ea84b25663f7233e1e0cff7f6945c3ed..bb4e66a8582819ad19be5c04e64b2cd484d7ad29 100644 (file)
--- a/inference/backends/mediavision/include/MvImageClassification.h
+++ b/inference/backends/mediavision/include/MvImageClassification.h
@@ -18,6 +18,7 @@
 #define __MV_IMAGE_CLASSIFICATION_H__
 
 #include "IInferenceTaskInterface.h"
+#include "mv_image_classification.h"
 #include "mv_image_classification_internal.h"
 #include "SingleoCommonTypes.h"
 

diff --git a/inference/backends/mediavision/include/MvObjectDetection.h b/inference/backends/mediavision/include/MvObjectDetection.h
index 74e5262ecfffa09ea246e75088ede4167993df26..65c5ca5baac479bbb878aef0b6c1bc1ef5eb4dc9 100644 (file)
--- a/inference/backends/mediavision/include/MvObjectDetection.h
+++ b/inference/backends/mediavision/include/MvObjectDetection.h
@@ -18,6 +18,7 @@
 #define __MV_OBJECT_DETECTION_H__
 
 #include "IInferenceTaskInterface.h"
+#include "mv_object_detection.h"
 #include "mv_object_detection_internal.h"
 #include "SingleoCommonTypes.h"
 

diff --git a/inference/backends/mediavision/src/MvFaceDetection.cpp b/inference/backends/mediavision/src/MvFaceDetection.cpp
index 9e7ab0c8a355b1b4feed3ba36f1f1f51cdc695b8..56f798c10c614995939e2c5a8424dd485ddec258 100644 (file)
--- a/inference/backends/mediavision/src/MvFaceDetection.cpp
+++ b/inference/backends/mediavision/src/MvFaceDetection.cpp
@@ -100,7 +100,7 @@ BaseResultType &MvFaceDetection::result()
        for (unsigned int idx = 0; idx < result_cnt; ++idx) {
                Rect rect;
 
-               ret = mv_face_detection_get_bbox(_handle, idx, &rect.left, &rect.top, &rect.right, &rect.bottom);
+               ret = mv_face_detection_get_bound_box(_handle, idx, &rect.left, &rect.top, &rect.right, &rect.bottom);
                if (ret != MEDIA_VISION_ERROR_NONE)
                        throw runtime_error("Fail to get face detection bound box.");
 

diff --git a/inference/backends/mediavision/src/MvObjectDetection.cpp b/inference/backends/mediavision/src/MvObjectDetection.cpp
index 1a6e6892bcbd629eed6b4da35e3a28351de3d4ce..d70ab7fcbcd45547cd263b83e2a18f8d889020fd 100644 (file)
--- a/inference/backends/mediavision/src/MvObjectDetection.cpp
+++ b/inference/backends/mediavision/src/MvObjectDetection.cpp
@@ -100,7 +100,7 @@ BaseResultType &MvObjectDetection::result()
        for (unsigned int idx = 0; idx < result_cnt; ++idx) {
                Rect rect;
 
-               ret = mv_object_detection_get_bbox(_handle, idx, &rect.left, &rect.top, &rect.right, &rect.bottom);
+               ret = mv_object_detection_get_bound_box(_handle, idx, &rect.left, &rect.top, &rect.right, &rect.bottom);
                if (ret != MEDIA_VISION_ERROR_NONE)
                        throw runtime_error("Fail to get object detection bound box.");