From c5869473bdf194dd44dc56d269399487106ff759 Mon Sep 17 00:00:00 2001 From: Minje Ahn Date: Tue, 11 Jul 2017 14:26:16 +0900 Subject: Remove original width, height parameters from response msg Change-Id: I7b11e8744939e67130826e43708e5474e39ed975 Signed-off-by: Minje Ahn --- server/thumb-server-internal.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'server/thumb-server-internal.c') diff --git a/server/thumb-server-internal.c b/server/thumb-server-internal.c index 7dfd897..ef2cb38 100755 --- a/server/thumb-server-internal.c +++ b/server/thumb-server-internal.c @@ -265,8 +265,6 @@ int _thumbnail_get_data(const char *origin_path, int *size, int *width, int *height, - int *origin_width, - int *origin_height, int *alpha, bool *is_saved) { @@ -319,8 +317,6 @@ int _thumbnail_get_data(const char *origin_path, if (width) *width = thumb_info.width; if (height) *height = thumb_info.height; *data = thumb_info.data; - if (origin_width) *origin_width = thumb_info.origin_width; - if (origin_height) *origin_height = thumb_info.origin_height; if (alpha) *alpha = thumb_info.alpha; if (is_saved) *is_saved = thumb_info.is_saved; @@ -389,8 +385,6 @@ int _media_thumb_process(thumbMsg *req_msg, thumbMsg *res_msg) int thumb_size = 0; int thumb_w = 0; int thumb_h = 0; - int origin_w = 0; - int origin_h = 0; int max_length = 0; char *thumb_path = NULL; int alpha = 0; @@ -415,10 +409,9 @@ int _media_thumb_process(thumbMsg *req_msg, thumbMsg *res_msg) return MS_MEDIA_ERR_FILE_NOT_EXIST; } - err = _media_thumb_get_thumb_from_db_with_size(origin_path, thumb_path, max_length, &origin_w, &origin_h, req_msg->uid); + err = _media_thumb_get_thumb_from_db(origin_path, thumb_path, max_length, req_msg->uid); if (err == MS_MEDIA_ERR_NONE) { - res_msg->origin_width = origin_w; - res_msg->origin_height = origin_h; + thumb_dbg_slog("Thumb path : %s", thumb_path); return MS_MEDIA_ERR_NONE; } else { if (strlen(thumb_path) == 0) { @@ -441,7 +434,7 @@ int _media_thumb_process(thumbMsg *req_msg, thumbMsg *res_msg) _media_thumb_remove_file(thumb_path); } - err = _thumbnail_get_data(origin_path, thumb_path, &data, &thumb_size, &thumb_w, &thumb_h, &origin_w, &origin_h, &alpha, &is_saved); + err = _thumbnail_get_data(origin_path, thumb_path, &data, &thumb_size, &thumb_w, &thumb_h, &alpha, &is_saved); if (err != MS_MEDIA_ERR_NONE) { thumb_err("_thumbnail_get_data failed - %d", err); SAFE_FREE(data); @@ -455,8 +448,6 @@ int _media_thumb_process(thumbMsg *req_msg, thumbMsg *res_msg) res_msg->thumb_size = thumb_size; res_msg->thumb_width = thumb_w; res_msg->thumb_height = thumb_h; - res_msg->origin_width = origin_w; - res_msg->origin_height = origin_h; /* If the image is transparent PNG format, make png file as thumbnail of this image */ if (alpha) { -- cgit v1.2.3