diff options
| author | jiyong.min <jiyong.min@samsung.com> | 2020-01-21 09:05:54 +0900 |
|---|---|---|
| committer | jiyong.min <jiyong.min@samsung.com> | 2020-01-23 06:38:15 +0900 |
| commit | c3306e18d913efa7ad741a6ca1ed76021d5fc73c (patch) | |
| tree | 23a3cd83df6400c535cfd7ff5c1d5f355b71bb88 | |
| parent | 1dbcc2241014a5090093bbccce4878010763d2ea (diff) | |
| download | libmedia-thumbnail-c3306e18d913efa7ad741a6ca1ed76021d5fc73c.tar.gz libmedia-thumbnail-c3306e18d913efa7ad741a6ca1ed76021d5fc73c.tar.bz2 libmedia-thumbnail-c3306e18d913efa7ad741a6ca1ed76021d5fc73c.zip | |
Remove unused 'err_attr_name' for 'mm_file_get_attrs'submit/tizen_5.5/20200123.020528accepted/tizen/5.5/unified/20200127.115834
Change-Id: I7c39443756963cbc327cb32b89bc0d8f0e497dbe
(cherry picked from commit dce91ae1bad8a4a761f99932d2d6eca124821edc)
| -rw-r--r-- | packaging/libmedia-thumbnail.spec | 2 | ||||
| -rwxr-xr-x | src/media-thumb-internal.c | 21 |
2 files changed, 8 insertions, 15 deletions
diff --git a/packaging/libmedia-thumbnail.spec b/packaging/libmedia-thumbnail.spec index 96d14bf..062f3f8 100644 --- 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.3.0 +Version: 0.3.1 Release: 0 Group: Multimedia/Libraries License: Apache-2.0 and PD diff --git a/src/media-thumb-internal.c b/src/media-thumb-internal.c index f7225a3..c22b8c7 100755 --- a/src/media-thumb-internal.c +++ b/src/media-thumb-internal.c @@ -141,7 +141,6 @@ static void __get_rotation_and_cdis(const char *origin_path, mm_util_magick_rota MMHandleType tag = (MMHandleType) NULL; char *p = NULL; int size = 0; - char *err_msg = NULL; int _cdis_value = 0; mm_util_magick_rotate_type _rot_type = MM_UTIL_ROTATE_NUM; @@ -153,7 +152,7 @@ static void __get_rotation_and_cdis(const char *origin_path, mm_util_magick_rota return; } - err = mm_file_get_attrs(tag, &err_msg, MM_FILE_TAG_ROTATE, &p, &size, NULL); + err = mm_file_get_attrs(tag, MM_FILE_TAG_ROTATE, &p, &size, NULL); if (err == FILEINFO_ERROR_NONE && size >= 0) { if (p == NULL) { _rot_type = MM_UTIL_ROTATE_0; @@ -171,14 +170,11 @@ static void __get_rotation_and_cdis(const char *origin_path, mm_util_magick_rota } else { thumb_dbg("There is NOT tag rotate"); _rot_type = MM_UTIL_ROTATE_0; - SAFE_FREE(err_msg); } - err = mm_file_get_attrs(tag, &err_msg, MM_FILE_TAG_CDIS, &_cdis_value, NULL); - if (err != FILEINFO_ERROR_NONE) { + err = mm_file_get_attrs(tag, MM_FILE_TAG_CDIS, &_cdis_value, NULL); + if (err != FILEINFO_ERROR_NONE) _cdis_value = 0; - SAFE_FREE(err_msg); - } *rot_type = _rot_type; *cdis_value = _cdis_value; @@ -195,7 +191,6 @@ static int __get_video_info(int cdis_value, const char *origin_path, int *video_ { int err = MS_MEDIA_ERR_NONE; MMHandleType content = (MMHandleType) NULL; - char *err_msg = NULL; int _video_track_num = 0; int _width = 0; int _height = 0; @@ -214,10 +209,9 @@ static int __get_video_info(int cdis_value, const char *origin_path, int *video_ return MS_MEDIA_ERR_INTERNAL; } - err = mm_file_get_attrs(content, &err_msg, MM_FILE_CONTENT_VIDEO_TRACK_COUNT, &_video_track_num, NULL); + err = mm_file_get_attrs(content, MM_FILE_CONTENT_VIDEO_TRACK_COUNT, &_video_track_num, NULL); if (err != FILEINFO_ERROR_NONE) { - thumb_err("mm_file_get_attrs fails : %s", err_msg); - SAFE_FREE(err_msg); + thumb_err("mm_file_get_attrs fails : %d", err); mm_file_destroy_content_attrs(content); return MS_MEDIA_ERR_INTERNAL; } @@ -229,7 +223,7 @@ static int __get_video_info(int cdis_value, const char *origin_path, int *video_ return MS_MEDIA_ERR_NONE; } - err = mm_file_get_attrs(content, &err_msg, + err = mm_file_get_attrs(content, MM_FILE_CONTENT_VIDEO_WIDTH, &_width, MM_FILE_CONTENT_VIDEO_HEIGHT, @@ -238,8 +232,7 @@ static int __get_video_info(int cdis_value, const char *origin_path, int *video_ &_size, NULL); if (err != FILEINFO_ERROR_NONE) { - thumb_err("mm_file_get_attrs fails : %s", err_msg); - SAFE_FREE(err_msg); + thumb_err("mm_file_get_attrs fails : %d", err); mm_file_destroy_content_attrs(content); return MS_MEDIA_ERR_INTERNAL; } |