Fix unsafe mix of types 'gboolean' and 'bool'

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

diff --git a/mv_machine_learning/mv_inference/inference/src/InputMetadata.cpp b/mv_machine_learning/mv_inference/inference/src/InputMetadata.cpp
index 28edbe3..befbd43 100644 (file)
--- a/mv_machine_learning/mv_inference/inference/src/InputMetadata.cpp
+++ b/mv_machine_learning/mv_inference/inference/src/InputMetadata.cpp
@@ -51,7 +51,7 @@ namespace inference
        {
                LOGI("ENTER");
 
-               if (json_object_has_member(root, "tensor_info") == false) {
+               if (!json_object_has_member(root, "tensor_info")) {
                        LOGE("No tensor_info inputmetadata");
                        return MEDIA_VISION_ERROR_INVALID_OPERATION;
                }
@@ -106,7 +106,7 @@ namespace inference
        {
                LOGI("ENTER");
 
-               if (json_object_has_member(root, "preprocess") == false) {
+               if (!json_object_has_member(root, "preprocess")) {
                        LOGI("No preprocess inputmetadata");
                        return MEDIA_VISION_ERROR_NONE;
                }

diff --git a/mv_machine_learning/mv_inference/inference/src/OutputMetadata.cpp b/mv_machine_learning/mv_inference/inference/src/OutputMetadata.cpp
index aab8b50..04f97cc 100755 (executable)
--- a/mv_machine_learning/mv_inference/inference/src/OutputMetadata.cpp
+++ b/mv_machine_learning/mv_inference/inference/src/OutputMetadata.cpp
@@ -77,7 +77,7 @@ namespace inference
        {
                LOGI("ENTER");
 
-               if (json_object_has_member(root, "score") == false) {
+               if (!json_object_has_member(root, "score")) {
                        LOGI("No score outputmetadata");
                        LOGI("LEAVE");
                        return MEDIA_VISION_ERROR_NONE;
@@ -158,7 +158,7 @@ namespace inference
        {
                LOGI("ENTER");
 
-               if (json_object_has_member(root, "box") == false) {
+               if (!json_object_has_member(root, "box")) {
                        LOGE("No box outputmetadata");
                        LOGI("LEAVE");
                        return MEDIA_VISION_ERROR_NONE;
@@ -202,7 +202,7 @@ namespace inference
        {
                LOGI("ENTER");
 
-               if (json_object_has_member(root, "label") == false) {
+               if (!json_object_has_member(root, "label")) {
                        LOGE("No box outputmetadata");
                        LOGI("LEAVE");
                        return MEDIA_VISION_ERROR_INVALID_OPERATION;
@@ -244,7 +244,7 @@ namespace inference
        {
                LOGI("ENTER");
 
-               if (json_object_has_member(root, "number") == false) {
+               if (!json_object_has_member(root, "number")) {
                        LOGE("No number outputmetadata");
                        LOGI("LEAVE");
                        return MEDIA_VISION_ERROR_INVALID_OPERATION;
@@ -259,7 +259,7 @@ namespace inference
        {
                LOGI("ENTER");
 
-               if (json_object_has_member(root, "box") == false) {
+               if (!json_object_has_member(root, "box")) {
                        LOGE("No box outputmetadata");
                        LOGI("LEAVE");
                        return MEDIA_VISION_ERROR_NONE;
@@ -274,7 +274,7 @@ namespace inference
                        JsonNode *pNode = json_array_get_element(rootArray, elem);
                        JsonObject *pObject = json_node_get_object(pNode);
 
-                       if (json_object_has_member(pObject, "decoding_info") == false) {
+                       if (!json_object_has_member(pObject, "decoding_info")) {
                                LOGE("decoding_info is mandatory. Invalid metadata");
                                LOGI("LEAVE");
 
@@ -282,7 +282,7 @@ namespace inference
                        }
 
                        JsonObject *cObject = json_object_get_object_member(pObject, "decoding_info");
-                       if (json_object_has_member(cObject, "anchor") == false) {
+                       if (!json_object_has_member(cObject, "anchor")) {
                                LOGE("anchor is mandatory. Invalid metadata");
                                LOGI("LEAVE");
 
@@ -499,7 +499,7 @@ namespace inference
 
        int BoxInfo::DecodeInfo::ParseNms(JsonObject *root)
        {
-               if (json_object_has_member(root, "nms") == false) {
+               if (!json_object_has_member(root, "nms")) {
                        LOGI("nms is empty. skip it");
                        return MEDIA_VISION_ERROR_NONE;
                }
@@ -523,7 +523,7 @@ namespace inference
 
        int BoxInfo::DecodeInfo::ParseRotate(JsonObject *root)
        {
-               if (json_object_has_member(root, "rotate") == false) {
+               if (!json_object_has_member(root, "rotate")) {
                        LOGI("rotate is empty. skip it");
                        return MEDIA_VISION_ERROR_NONE;
                }
@@ -593,7 +593,7 @@ namespace inference
 
        int BoxInfo::DecodeInfo::ParseRoiOption(JsonObject *root)
        {
-               if (json_object_has_member(root, "roi") == false) {
+               if (!json_object_has_member(root, "roi")) {
                        LOGI("roi is empty. skip it");
                        return MEDIA_VISION_ERROR_NONE;
                }
@@ -731,7 +731,7 @@ namespace inference
        {
                LOGI("ENTER");
 
-               if (json_object_has_member(root, "landmark") == false) {
+               if (!json_object_has_member(root, "landmark")) {
                        LOGI("No landmark outputmetadata");
                        LOGI("LEAVE");
                        return MEDIA_VISION_ERROR_NONE;
@@ -747,7 +747,7 @@ namespace inference
        {
                LOGI("ENTER");
 
-               if (json_object_has_member(root, "landmark") == false) {
+               if (!json_object_has_member(root, "landmark")) {
                        LOGI("No landmark outputmetadata");
                        LOGI("LEAVE");
                        return MEDIA_VISION_ERROR_NONE;
@@ -763,7 +763,7 @@ namespace inference
                        JsonNode *pNode = json_array_get_element(rootArray, elem);
                        JsonObject *pObject = json_node_get_object(pNode);
 
-                       if (json_object_has_member(pObject, "decoding_info") == false) {
+                       if (!json_object_has_member(pObject, "decoding_info")) {
                                LOGE("decoding_info is mandatory. Invalid metadata");
                                LOGI("LEAVE");
 
@@ -771,7 +771,7 @@ namespace inference
                        }
 
                        JsonObject *cObject = json_object_get_object_member(pObject, "decoding_info");
-                       if (json_object_has_member(cObject, "heatmap") == false) {
+                       if (!json_object_has_member(cObject, "heatmap")) {
                                LOGE("heatmap is mandatory. Invalid metadata");
                                LOGI("LEAVE");
 
@@ -840,7 +840,7 @@ namespace inference
        {
                LOGI("ENTER");
 
-               if (json_object_has_member(root, "offset") == false) {
+               if (!json_object_has_member(root, "offset")) {
                        LOGI("No offset outputmetadata");
                        LOGI("LEAVE");
                        return MEDIA_VISION_ERROR_INVALID_OPERATION;
@@ -884,7 +884,7 @@ namespace inference
        {
                LOGI("ENTER");
 
-               if (json_object_has_member(root, "displacement") == false) {
+               if (!json_object_has_member(root, "displacement")) {
                        LOGI("No displacement outputmetadata");
                        LOGI("LEAVE");
                        return MEDIA_VISION_ERROR_INVALID_OPERATION;
@@ -932,7 +932,7 @@ namespace inference
        {
                LOGI("ENTER");
 
-               if (json_object_has_member(root, "edgemap") == false) {
+               if (!json_object_has_member(root, "edgemap")) {
                        LOGI("No edgemap outputmetadata");
                        LOGI("LEAVE");
                        return MEDIA_VISION_ERROR_INVALID_OPERATION;

diff --git a/packaging/capi-media-vision.spec b/packaging/capi-media-vision.spec
index 18e1793..6b97410 100644 (file)
--- a/packaging/capi-media-vision.spec
+++ b/packaging/capi-media-vision.spec
@@ -1,6 +1,6 @@
 Name:        capi-media-vision
 Summary:     Media Vision library for Tizen Native API
-Version:     0.8.5
+Version:     0.8.6
 Release:     0
 Group:       Multimedia/Framework
 License:     Apache-2.0 and BSD-3-Clause