From a01e73a9073553546313762416b6188dbcd81bac Mon Sep 17 00:00:00 2001 From: Haejeong Kim Date: Fri, 25 Aug 2017 17:48:22 +0900 Subject: [PATCH] Remove useless media-thumbnail dependency Change-Id: I305b16195ddf0ffcdf1045be857bb57b5749ccdb --- CMakeLists.txt | 2 +- packaging/dcm-service.spec | 3 +-- src/dcm_svc_internal.c | 13 ------------- src/dcm_svc_ipc.c | 2 +- 4 files changed, 3 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0d6f25f..fde3d20 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,7 +42,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/libdcm-util/ INCLUDE(FindPkgConfig) pkg_check_modules(pkgs REQUIRED glib-2.0 gthread-2.0 dlog sqlite3 capi-media-image-util capi-media-vision -media-thumbnail libmedia-utils uuid vconf libtzplatform-config) + libmedia-utils uuid vconf libtzplatform-config) FOREACH(flag ${pkgs_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") diff --git a/packaging/dcm-service.spec b/packaging/dcm-service.spec index dd72bd7..06d2e28 100755 --- a/packaging/dcm-service.spec +++ b/packaging/dcm-service.spec @@ -1,6 +1,6 @@ Name: dcm-service Summary: A media DCM(Digital Contents Management) Service -Version: 0.1.8 +Version: 0.1.9 Release: 0 Group: Multimedia/Service License: Apache-2.0 @@ -17,7 +17,6 @@ BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(capi-media-image-util) BuildRequires: pkgconfig(capi-media-vision) -BuildRequires: pkgconfig(media-thumbnail) BuildRequires: pkgconfig(libmedia-utils) BuildRequires: pkgconfig(libtzplatform-config) BuildRequires: pkgconfig(vconf) diff --git a/src/dcm_svc_internal.c b/src/dcm_svc_internal.c index 54860ba..42ea9fa 100755 --- a/src/dcm_svc_internal.c +++ b/src/dcm_svc_internal.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include @@ -234,24 +233,12 @@ static int __dcm_scan_process(dcm_svc_item_s *scan_item) dcm_sec_debug("scan file path : [%s]", scan_item->file_path); dcm_sec_debug("scan media uuid : [%s]", scan_item->media_uuid); - ImgCodecType type = IMG_CODEC_NONE; - image_info.original_width = scan_item->image_width; image_info.original_height = scan_item->image_height; image_info.orientation = scan_item->image_orientation; dcm_info("scan media w : [%d], h : [%d], orientation : [%d]", image_info.original_width, image_info.original_height, scan_item->image_orientation); - if (image_info.original_width <= 0 && image_info.original_height <= 0) { - ret = ImgGetImageInfo((const char *)(scan_item->file_path), &type, &(image_info.original_width), &(image_info.original_height)); - if (ret != MS_MEDIA_ERR_NONE) { - dcm_error("Failed ImgGetImageInfo! err: %d", ret); - return ret; - } - - dcm_debug("ImgGetImageInfo type: %d, width: %d, height: %d", type, image_info.original_width, image_info.original_height); - } - if (strcmp(scan_item->mime_type, MIME_TYPE_JPEG) == 0) { image_info.decode_type = DCM_IMAGE_FORMAT_RGB; } else if ((strcmp(scan_item->mime_type, MIME_TYPE_PNG) == 0) || diff --git a/src/dcm_svc_ipc.c b/src/dcm_svc_ipc.c index 0fff858..e145bd6 100755 --- a/src/dcm_svc_ipc.c +++ b/src/dcm_svc_ipc.c @@ -161,7 +161,7 @@ int dcm_ipc_send_client_message(int socket_fd, ms_dcm_msg_type_e msg_type, unsig serv_addr.sun_family = AF_UNIX; DCM_SAFE_STRLCPY(serv_addr.sun_path, tzplatform_mkpath(TZ_SYS_RUN, DCM_IPC_PATH[port]), sizeof(serv_addr.sun_path)); - /* Connecting to the thumbnail server */ + /* Connecting to the media server */ if (connect(sock, (struct sockaddr*)&serv_addr, sizeof(serv_addr)) < 0) { dcm_stderror("connect"); close(sock); -- 2.34.1