projects
/
platform
/
core
/
multimedia
/
libmedia-service.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correct the type
[platform/core/multimedia/libmedia-service.git]
/
src
/
common
/
media-svc-util.c
diff --git
a/src/common/media-svc-util.c
b/src/common/media-svc-util.c
index
5a1956f
..
a4bed31
100644
(file)
--- a/
src/common/media-svc-util.c
+++ b/
src/common/media-svc-util.c
@@
-152,7
+152,7
@@
static char * __media_svc_get_exif_datetaken(ExifData *ed)
return NULL;
}
return NULL;
}
-static bool __media_svc_get_exif_
int(ExifData *ed, ExifTag tagtype, in
t *value)
+static bool __media_svc_get_exif_
short(ExifData *ed, ExifTag tagtype, unsigned shor
t *value)
{
ExifEntry *entry;
{
ExifEntry *entry;
@@
-161,10
+161,7
@@
static bool __media_svc_get_exif_int(ExifData *ed, ExifTag tagtype, int *value)
entry = exif_data_get_entry(ed, tagtype);
media_svc_retv_if(!entry, false);
entry = exif_data_get_entry(ed, tagtype);
media_svc_retv_if(!entry, false);
-
- short exif_value = exif_get_short(entry->data, exif_data_get_byte_order(ed));
- media_svc_retv_if(exif_value < 0, false);
- *value = (int)exif_value;
+ *value = exif_get_short(entry->data, exif_data_get_byte_order(ed));
return true;
}
return true;
}
@@
-456,9
+453,9
@@
char * _media_svc_get_title_from_filename(const char *filename)
int _media_svc_extract_image_metadata(media_svc_content_info_s *content_info)
{
int _media_svc_extract_image_metadata(media_svc_content_info_s *content_info)
{
-
in
t orient_value = 0;
-
in
t exif_width = 0;
-
in
t exif_height = 0;
+
unsigned shor
t orient_value = 0;
+
unsigned shor
t exif_width = 0;
+
unsigned shor
t exif_height = 0;
ExifData *ed = NULL;
media_svc_retvm_if(!content_info, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid content_info");
ExifData *ed = NULL;
media_svc_retvm_if(!content_info, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid content_info");
@@
-476,16
+473,16
@@
int _media_svc_extract_image_metadata(media_svc_content_info_s *content_info)
content_info->media_meta.datetaken = __media_svc_get_exif_datetaken(ed);
content_info->media_meta.datetaken = __media_svc_get_exif_datetaken(ed);
- if (__media_svc_get_exif_
in
t(ed, EXIF_TAG_ORIENTATION, &orient_value)) {
- if (orient_value
>= NOT_AVAILABLE && orient_value
<= ROT_270)
+ if (__media_svc_get_exif_
shor
t(ed, EXIF_TAG_ORIENTATION, &orient_value)) {
+ if (orient_value <= ROT_270)
content_info->media_meta.orientation = orient_value;
}
content_info->media_meta.orientation = orient_value;
}
- if (__media_svc_get_exif_
in
t(ed, EXIF_TAG_PIXEL_X_DIMENSION, &exif_width))
- content_info->media_meta.width = exif_width;
+ if (__media_svc_get_exif_
shor
t(ed, EXIF_TAG_PIXEL_X_DIMENSION, &exif_width))
+ content_info->media_meta.width =
(unsigned int)
exif_width;
- if (__media_svc_get_exif_
in
t(ed, EXIF_TAG_PIXEL_Y_DIMENSION, &exif_height))
- content_info->media_meta.height = exif_height;
+ if (__media_svc_get_exif_
shor
t(ed, EXIF_TAG_PIXEL_Y_DIMENSION, &exif_height))
+ content_info->media_meta.height =
(unsigned int)
exif_height;
exif_data_unref(ed);
exif_data_unref(ed);