mv3d: fix vision.3d feature check

[Issue type] bug fix

Change-Id: I9022dcecaf812bc866ee36ee7cff758fb413f7c9
Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>

diff --git a/mv_3d/3d/src/mv_3d.c b/mv_3d/3d/src/mv_3d.c
index ef7f939..3dd6c70 100644 (file)
--- a/mv_3d/3d/src/mv_3d.c
+++ b/mv_3d/3d/src/mv_3d.c
@@ -69,7 +69,7 @@ int mv_3d_configure(mv_3d_h mv3d, mv_engine_config_h engine_config)
 
 int mv_3d_set_depth_cb(mv_3d_h mv3d, mv_3d_depth_cb depth_cb, void *user_data)
 {
-       MEDIA_VISION_SUPPORT_CHECK(_mv_3d_depth_check_system_info_feature_supported() ||
+       MEDIA_VISION_SUPPORT_CHECK(_mv_3d_depth_check_system_info_feature_supported() &&
                                                           _mv_3d_check_system_info_feature_supported());
        MEDIA_VISION_INSTANCE_CHECK(mv3d);
 
@@ -86,7 +86,7 @@ int mv_3d_set_depth_cb(mv_3d_h mv3d, mv_3d_depth_cb depth_cb, void *user_data)
 
 int mv_3d_set_pointcloud_cb(mv_3d_h mv3d, mv_3d_pointcloud_cb pointcloud_cb, void *user_data)
 {
-       MEDIA_VISION_SUPPORT_CHECK(_mv_3d_pointcloud_check_system_info_feature_supported() ||
+       MEDIA_VISION_SUPPORT_CHECK(_mv_3d_pointcloud_check_system_info_feature_supported() &&
                                                           _mv_3d_check_system_info_feature_supported());
        MEDIA_VISION_INSTANCE_CHECK(mv3d);
 
@@ -148,7 +148,7 @@ int mv_3d_run_async(mv_3d_h mv3d, mv_source_h source, mv_source_h source_extra,
 int mv_3d_pointcloud_write_file(mv_3d_h mv3d, mv_3d_pointcloud_h pointcloud, mv_3d_pointcloud_type_e type,
                                                                char *filename)
 {
-       MEDIA_VISION_SUPPORT_CHECK(_mv_3d_pointcloud_check_system_info_feature_supported() ||
+       MEDIA_VISION_SUPPORT_CHECK(_mv_3d_pointcloud_check_system_info_feature_supported() &&
                                                           _mv_3d_check_system_info_feature_supported());
        MEDIA_VISION_INSTANCE_CHECK(mv3d);
        MEDIA_VISION_INSTANCE_CHECK(pointcloud);

diff --git a/mv_common/src/mv_private.c b/mv_common/src/mv_private.c
index 1a50c81..a4884b3 100644 (file)
--- a/mv_common/src/mv_private.c
+++ b/mv_common/src/mv_private.c
@@ -262,8 +262,8 @@ bool _mv_roi_tracking_check_system_info_feature_supported(void)
 
 bool _mv_3d_all_check_system_info_feature_supported(void)
 {
-       return _mv_3d_check_system_info_feature_supported() || _mv_3d_depth_check_system_info_feature_supported() ||
-                  _mv_3d_pointcloud_check_system_info_feature_supported();
+       return _mv_3d_check_system_info_feature_supported() && (_mv_3d_depth_check_system_info_feature_supported() ||
+                                                                                                                       _mv_3d_pointcloud_check_system_info_feature_supported());
 }
 
 bool _mv_3d_check_system_info_feature_supported(void)