From 18e2b5002efa2e16804fd2d2b5e413ef9ff2de99 Mon Sep 17 00:00:00 2001 From: "minje.ahn" Date: Wed, 24 Jan 2024 15:21:49 +0900 Subject: [PATCH] Update media-thumbnail error type Change-Id: I4149fef893951d4b2dc1b107f715631d76557f77 Signed-off-by: minje.ahn --- CMakeLists.txt | 2 +- packaging/capi-media-thumbnail-util.spec | 1 - src/thumbnail_util.c | 11 ++++------- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ad6e59..b46074b 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,7 +26,7 @@ SET(submodule "thumbnail-util") SET(fw_name "${project_prefix}-${service}-${submodule}") # for package file -SET(dependents "capi-base-common media-thumbnail libmedia-utils") +SET(dependents "capi-base-common media-thumbnail") SET(pc_dependents "capi-base-common") PROJECT(${fw_name}) diff --git a/packaging/capi-media-thumbnail-util.spec b/packaging/capi-media-thumbnail-util.spec index 0b37d3d..a95feb8 100644 --- a/packaging/capi-media-thumbnail-util.spec +++ b/packaging/capi-media-thumbnail-util.spec @@ -6,7 +6,6 @@ Group: Multimedia/API License: Apache-2.0 Source0: %{name}-%{version}.tar.gz BuildRequires: cmake -BuildRequires: pkgconfig(libmedia-utils) BuildRequires: pkgconfig(capi-base-common) BuildRequires: pkgconfig(media-thumbnail) Requires(post): /sbin/ldconfig diff --git a/src/thumbnail_util.c b/src/thumbnail_util.c index 2acc7a1..b478e38 100644 --- a/src/thumbnail_util.c +++ b/src/thumbnail_util.c @@ -16,21 +16,18 @@ #include #include -#include // LCOV_EXCL_START static int __thumbnail_util_error_capi(int internal_error) { switch (internal_error) { - case MS_MEDIA_ERR_NONE: + case THUMB_OK: return THUMBNAIL_UTIL_ERROR_NONE; - case MS_MEDIA_ERR_INVALID_PARAMETER: + case THUMB_FAIL: return THUMBNAIL_UTIL_ERROR_INVALID_PARAMETER; - case MS_MEDIA_ERR_OUT_OF_MEMORY: - return THUMBNAIL_UTIL_ERROR_OUT_OF_MEMORY; - case MS_MEDIA_ERR_PERMISSION_DENIED: + case THUMB_PERM: return THUMBNAIL_UTIL_ERROR_PERMISSION_DENIED; - case MS_MEDIA_ERR_THUMB_UNSUPPORTED: + case THUMB_UNSUPPORTED: return THUMBNAIL_UTIL_ERROR_UNSUPPORTED_CONTENT; default: return THUMBNAIL_UTIL_ERROR_INVALID_OPERATION; -- 2.34.1