Remove USE_MEMORY_USAGE_REDUCTION define as default

Change-Id: I3f333ad29f48b9efb666b8e977fc2fc820e00ab7

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eeff3fb234e6e30d775417688e0f23f17cd94e29..23dbe7d0f6d19d1b14a8002eb00a57b625a62a43 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,13 +26,8 @@ MESSAGE("Build type: ${CMAKE_BUILD_TYPE}")
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 
-IF(WITH_DA_PROFILE)
 INCLUDE(FindPkgConfig)
        pkg_check_modules(pkgs REQUIRED dlog mm-fileinfo aul mmutil-common mmutil-magick mmutil-gif mmutil-jpeg libexif)
-ELSE(WITH_DA_PROFILE)
-INCLUDE(FindPkgConfig)
-       pkg_check_modules(pkgs REQUIRED dlog mm-fileinfo aul mmutil-common mmutil-magick)
-ENDIF(WITH_DA_PROFILE)
 
 FOREACH(flag ${pkgs_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
@@ -56,7 +51,6 @@ ADD_DEFINITIONS("-DPREFIX=\"${PREFIX}\"")
 ADD_DEFINITIONS("-D_GNU_SOURCE")
 
 IF(WITH_DA_PROFILE)
-       ADD_DEFINITIONS("-DUSE_MEMORY_USAGE_REDUCTION")
        ADD_DEFINITIONS("-DENABLE_IMAGE_SIZE_LIMITATION")
 ENDIF(WITH_DA_PROFILE)
 

diff --git a/packaging/libmedia-thumbnail.spec b/packaging/libmedia-thumbnail.spec
index 997a92c8772831eef92853c5c380a531bedadb77..6b84cb2863d8440676c957545d777fa797eff537 100644 (file)
--- a/packaging/libmedia-thumbnail.spec
+++ b/packaging/libmedia-thumbnail.spec
@@ -1,6 +1,6 @@
 Name:       libmedia-thumbnail
 Summary:    Media thumbnail service library for multimedia applications
-Version:    0.4.9
+Version:    0.4.10
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0
@@ -18,11 +18,9 @@ BuildRequires: pkgconfig(mmutil-magick)
 BuildRequires: pkgconfig(libtzplatform-config)
 BuildRequires: pkgconfig(gmock)
 %endif
-%if 0%{?_with_da_profile:1}
 BuildRequires: pkgconfig(mmutil-gif)
 BuildRequires: pkgconfig(mmutil-jpeg)
 BuildRequires: pkgconfig(libexif)
-%endif
 
 %description
 Description: Media thumbnail service library for multimedia applications

diff --git a/src/media-thumbnail.c b/src/media-thumbnail.c
index 146bd28f402a73b4b7b8c8bfc5358c8f07955dd7..53ce14757b78622918eca570369695892b694b3a 100644 (file)
--- a/src/media-thumbnail.c
+++ b/src/media-thumbnail.c
@@ -25,11 +25,9 @@
 #include <mm_file.h>
 #include <mm_util_image.h>
 #include <mm_util_magick.h>
-#if defined(USE_MEMORY_USAGE_REDUCTION)
 #include <mm_util_gif.h>
 #include <mm_util_jpeg.h>
 #include <libexif/exif-data.h>
-#endif
 
 #include "media-thumbnail.h"
 #include "media-thumbnail-debug.h"
@@ -416,7 +414,6 @@ static int __adjust_thumb_ratio(const char *path, unsigned int *width, unsigned
        return THUMB_OK;
 }
 
-#if defined(USE_MEMORY_USAGE_REDUCTION)
 static mm_util_rotate_type_e __get_image_orientation(const char *path)
 {
        ExifData *ed = NULL;
@@ -555,7 +552,6 @@ static int __create_jpeg_thumbnail_to_buffer(const char *path, size_t image_size
 
        return THUMB_OK;
 }
-#endif
 
 int create_image_thumbnail_to_file(const char *path, unsigned int width, unsigned int height, const char *thumb_path, bool auto_rotate)
 {
@@ -572,12 +568,10 @@ int create_image_thumbnail_to_file(const char *path, unsigned int width, unsigne
        err = __adjust_thumb_ratio(path, &thumb_w, &thumb_h, &image_w, &image_h, &image_type);
        thumb_retvm_if(err != THUMB_OK, err, "__adjust_thumb_ratio failed");
 
-#if defined(USE_MEMORY_USAGE_REDUCTION)
        if (image_type == IMG_CODEC_GIF)
                return __create_gif_thumbnail_to_file(path, thumb_w, thumb_h, thumb_path);
        else if (image_type == IMG_CODEC_JPEG)
                return __create_jpeg_thumbnail_to_file(path, (size_t)(image_w * image_h), thumb_w, thumb_h, thumb_path, auto_rotate);
-#endif
 
        if (auto_rotate)
                err = mm_util_resize_and_rotate_P_P(path, thumb_w, thumb_h, thumb_path);
@@ -604,16 +598,13 @@ int create_image_thumbnail_to_buffer(const char *path, unsigned int width, unsig
        err = __adjust_thumb_ratio(path, &thumb_w, &thumb_h, &image_w, &image_h, &image_type);
        thumb_retvm_if(err != THUMB_OK, err, "__adjust_thumb_ratio failed");
 
-#if defined(USE_MEMORY_USAGE_REDUCTION)
        if (image_type == IMG_CODEC_GIF) {
                err = __create_gif_thumbnail_to_buffer(path, thumb_w, thumb_h, &img);
                thumb_retvm_if(err != MM_UTIL_ERROR_NONE, THUMB_FAIL, "__create_gif_thumbnail_to_buffer failed : %d", err);
        } else if (image_type == IMG_CODEC_JPEG) {
                err = __create_jpeg_thumbnail_to_buffer(path, (size_t)(image_w * image_h), thumb_w, thumb_h, &img);
                thumb_retvm_if(err != MM_UTIL_ERROR_NONE, THUMB_FAIL, "__create_jpeg_thumbnail_to_buffer failed : %d", err);
-       } else
-#endif
-       {
+       } else {
                err = mm_util_resize_P_B(path, thumb_w, thumb_h, MM_UTIL_COLOR_BGRA, &img);
                thumb_retvm_if(err != MM_UTIL_ERROR_NONE, THUMB_FAIL, "mm_util_resize_P_B failed : %d", err);
        }