From 969d045726c40b95dbad30f564b7439a8f9cae9d Mon Sep 17 00:00:00 2001 From: "jiyong.min" Date: Thu, 7 Mar 2019 11:03:50 +0900 Subject: [PATCH] Replace mm-utility function to mm_image_xxx() Change-Id: Icedf17c1d6b7393ac9c78a05fc5067ed4a91bc04 --- CMakeLists.txt | 2 +- libdcm-util/dcm_image_codec.c | 10 +++++----- packaging/dcm-service.spec | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 802b56c..2f40410 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/libdcm-util/ INCLUDE(FindPkgConfig) pkg_check_modules(pkgs REQUIRED glib-2.0 dlog sqlite3 capi-media-vision - libmedia-utils libtzplatform-config mmutil-magick) + libmedia-utils libtzplatform-config mmutil-common mmutil-magick) FOREACH(flag ${pkgs_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") diff --git a/libdcm-util/dcm_image_codec.c b/libdcm-util/dcm_image_codec.c index 01dd854..ab2f8ea 100755 --- a/libdcm-util/dcm_image_codec.c +++ b/libdcm-util/dcm_image_codec.c @@ -131,14 +131,14 @@ int dcm_decode_image(const char *file_path, const int orientation, const gboolea } } - mm_util_get_image(dst_handle, image_buffer, buff_width, buff_height, size, &format); + mm_image_get_image(dst_handle, buff_width, buff_height, &format, image_buffer, size); ERROR: - if (resize_dst_handle != NULL) - mm_util_destroy_handle(resize_dst_handle); - if (dst_handle != NULL) - mm_util_destroy_handle(dst_handle); + if (resize_dst_handle) + mm_image_destroy_image(resize_dst_handle); + if (dst_handle) + mm_image_destroy_image(dst_handle); dcm_debug_fleave(); diff --git a/packaging/dcm-service.spec b/packaging/dcm-service.spec index c4419ae..339086e 100644 --- a/packaging/dcm-service.spec +++ b/packaging/dcm-service.spec @@ -17,6 +17,7 @@ BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(capi-media-vision) BuildRequires: pkgconfig(libmedia-utils) BuildRequires: pkgconfig(libtzplatform-config) +BuildRequires: pkgconfig(mmutil-common) BuildRequires: pkgconfig(mmutil-magick) %if 0%{?gtests:1} BuildRequires: pkgconfig(gmock) -- 2.34.1