Use get_image_info instead

For reduce dependency, used get_image_info() instead of mm_util_extract_image_info()

Change-Id: I9d9b7bb7a9542af5497914186d766993cd8d82a0
Signed-off-by: minje.ahn <minje.ahn@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index af7295d..1e0f981 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,7 +50,7 @@ EXEC_PROGRAM("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "ARCH")
 
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(pkgs REQUIRED glib-2.0 dlog sqlite3 libexif mm-fileinfo libmedia-utils aul uuid libxml-2.0 libzip mmutil-magick media-thumbnail libpodofo iniparser)
+pkg_check_modules(pkgs REQUIRED glib-2.0 dlog sqlite3 libexif mm-fileinfo libmedia-utils aul uuid libxml-2.0 libzip media-thumbnail libpodofo iniparser)
 
 FOREACH(flag ${pkgs_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/packaging/libmedia-service.spec b/packaging/libmedia-service.spec
index 7fdc2f9..1c1bb48 100644 (file)
--- a/packaging/libmedia-service.spec
+++ b/packaging/libmedia-service.spec
@@ -1,6 +1,6 @@
 Name:       libmedia-service
 Summary:    Media information service library for multimedia applications
-Version:    0.5.1
+Version:    0.5.2
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0
@@ -21,7 +21,6 @@ BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(mm-fileinfo)
 BuildRequires:  pkgconfig(libmedia-utils)
 BuildRequires:  pkgconfig(uuid)
-BuildRequires:  pkgconfig(mmutil-magick)
 BuildRequires:  pkgconfig(media-thumbnail)
 BuildRequires:  pkgconfig(libpodofo)
 BuildRequires:  pkgconfig(iniparser)

diff --git a/src/common/media-svc-util.c b/src/common/media-svc-util.c
index bc2df0c..8fbb2a8 100644 (file)
--- a/src/common/media-svc-util.c
+++ b/src/common/media-svc-util.c
@@ -29,7 +29,6 @@
 #include <libexif/exif-data.h>
 #include <media-util.h>
 #include <uuid/uuid.h>
-#include <mm_util_magick.h>
 #include <media-thumbnail.h>
 #include "media-svc-util.h"
 #include "media-svc-db-utils.h"
@@ -555,14 +554,14 @@ int _media_svc_extract_image_metadata(media_svc_content_info_s *content_info)
                exif_data_unref(ed);
 
 GET_WIDTH_HEIGHT:
-
        if (content_info->media_meta.width == 0 || content_info->media_meta.height == 0) {
                /*Get image width, height*/
                unsigned int img_width = 0;
                unsigned int img_height = 0;
-               mm_util_img_codec_type img_type = IMG_CODEC_UNKNOWN_TYPE;
 
-               mm_util_extract_image_info(path, &img_type, &img_width, &img_height);
+               if (get_image_info(path, &img_width, &img_height) != THUMB_OK)
+                       return MS_MEDIA_ERR_NONE;
+
                if (content_info->media_meta.width == 0)
                        content_info->media_meta.width = img_width;