From 61ac1bf60cd0151af2b1d7e259b382ffd3c87ec9 Mon Sep 17 00:00:00 2001 From: Tae-Young Chung Date: Mon, 28 Dec 2015 10:08:17 +0900 Subject: [PATCH] Fixed incompatibility heap free Change-Id: I59ae33f87e76a85769013ff7c92b200b447e0073 Signed-off-by: Tae-Young Chung --- mv_face/face/src/mv_face_open.cpp | 2 +- mv_surveillance/surveillance/src/EventTrigger.cpp | 9 ++++++--- packaging/capi-media-vision.spec | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/mv_face/face/src/mv_face_open.cpp b/mv_face/face/src/mv_face_open.cpp index 0412f85..917924e 100644 --- a/mv_face/face/src/mv_face_open.cpp +++ b/mv_face/face/src/mv_face_open.cpp @@ -726,7 +726,7 @@ int mv_face_recognition_model_query_labels_open( const std::set& learnedLabels = pRecModel->getFaceLabels(); *number_of_labels = learnedLabels.size(); - (*labels) = new int[*number_of_labels]; + (*labels) = (int*)malloc(sizeof(int) * (*number_of_labels)); std::set::const_iterator it = learnedLabels.begin(); int i = 0; diff --git a/mv_surveillance/surveillance/src/EventTrigger.cpp b/mv_surveillance/surveillance/src/EventTrigger.cpp index d6b4cec..c2fec7c 100644 --- a/mv_surveillance/surveillance/src/EventTrigger.cpp +++ b/mv_surveillance/surveillance/src/EventTrigger.cpp @@ -144,8 +144,10 @@ int EventTrigger::applyROIToImage( &maskBuffer); if (error != MEDIA_VISION_ERROR_NONE || maskBuffer == NULL) { - if (maskBuffer != NULL) - delete maskBuffer; + if (maskBuffer != NULL) { + free(maskBuffer); + maskBuffer = NULL; + } LOGE("Getting mask buffer failed."); return error; @@ -159,7 +161,8 @@ int EventTrigger::applyROIToImage( imageWidth, image); - delete maskBuffer; + free(maskBuffer); + maskBuffer = NULL; if (error != MEDIA_VISION_ERROR_NONE) { LOGE("Applying mask buffer failed."); diff --git a/packaging/capi-media-vision.spec b/packaging/capi-media-vision.spec index 32d97bc..d7261c8 100644 --- 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.3.4 +Version: 0.3.5 Release: 0 Group: Multimedia/Framework License: Apache-2.0 and BSD-2.0 -- 2.7.4