[ACR-1618] Add API to get media handle by path

[platform/core/api/media-content.git] / src / media_image.c

diff --git a/src/media_image.c b/src/media_image.c
index aa77ac3..b114c12 100755 (executable)
--- a/src/media_image.c
+++ b/src/media_image.c
@@ -20,13 +20,14 @@
 int image_meta_destroy(image_meta_h image)
 {
        image_meta_s *_image = (image_meta_s*)image;
-       content_retvm_if(_image == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Image handle is null");
 
-       SAFE_FREE(_image->media_id);
-       SAFE_FREE(_image->date_taken);
-       SAFE_FREE(_image->exposure_time);
-       SAFE_FREE(_image->model);
-       SAFE_FREE(_image);
+       content_retip_if_fail(image);
+
+       g_free(_image->media_id);
+       g_free(_image->date_taken);
+       g_free(_image->exposure_time);
+       g_free(_image->model);
+       g_free(_image);
 
        return MEDIA_CONTENT_ERROR_NONE;
 }
@@ -34,10 +35,11 @@ int image_meta_destroy(image_meta_h image)
 int image_meta_clone(image_meta_h *dst, image_meta_h src)
 {
        image_meta_s *_src = (image_meta_s*)src;
-       content_retvm_if(!_src, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Source handle is null");
 
-       image_meta_s *_dst = (image_meta_s*)calloc(1, sizeof(image_meta_s));
-       content_retvm_if(!_dst, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
+       content_retip_if_fail(dst);
+       content_retip_if_fail(src);
+
+       image_meta_s *_dst = g_new0(image_meta_s, 1);
 
        _dst->media_id = g_strdup(_src->media_id);
        _dst->date_taken = g_strdup(_src->date_taken);
@@ -57,7 +59,9 @@ int image_meta_clone(image_meta_h *dst, image_meta_h src)
 int image_meta_get_media_id(image_meta_h image, char **media_id)
 {
        image_meta_s *_image = (image_meta_s*)image;
-       content_retvm_if(!_image || !media_id, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid parameter");
+
+       content_retip_if_fail(image);
+       content_retip_if_fail(media_id);
 
        *media_id = g_strdup(_image->media_id);
 
@@ -67,7 +71,9 @@ int image_meta_get_media_id(image_meta_h image, char **media_id)
 int image_meta_get_width(image_meta_h image, int *width)
 {
        image_meta_s *_image = (image_meta_s*)image;
-       content_retvm_if(!_image || !width, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid parameter");
+
+       content_retip_if_fail(image);
+       content_retip_if_fail(width);
 
        *width = _image->width;
 
@@ -76,7 +82,9 @@ int image_meta_get_width(image_meta_h image, int *width)
 int image_meta_get_height(image_meta_h image, int *height)
 {
        image_meta_s *_image = (image_meta_s*)image;
-       content_retvm_if(!_image || !height, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid parameter");
+
+       content_retip_if_fail(image);
+       content_retip_if_fail(height);
 
        *height = _image->height;
 
@@ -86,7 +94,9 @@ int image_meta_get_height(image_meta_h image, int *height)
 int image_meta_get_orientation(image_meta_h image, media_content_orientation_e* orientation)
 {
        image_meta_s *_image = (image_meta_s*)image;
-       content_retvm_if(!_image || !orientation, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid parameter");
+
+       content_retip_if_fail(image);
+       content_retip_if_fail(orientation);
 
        *orientation = _image->orientation;
 
@@ -96,7 +106,9 @@ int image_meta_get_orientation(image_meta_h image, media_content_orientation_e*
 int image_meta_get_date_taken(image_meta_h image, char **date_taken)
 {
        image_meta_s *_image = (image_meta_s*)image;
-       content_retvm_if(!_image || !date_taken, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid parameter");
+
+       content_retip_if_fail(image);
+       content_retip_if_fail(date_taken);
 
        *date_taken = g_strdup(_image->date_taken);
 
@@ -106,7 +118,9 @@ int image_meta_get_date_taken(image_meta_h image, char **date_taken)
 int image_meta_get_exposure_time(image_meta_h image, char **exposure_time)
 {
        image_meta_s *_image = (image_meta_s*)image;
-       content_retvm_if(!_image || !exposure_time, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid parameter");
+
+       content_retip_if_fail(image);
+       content_retip_if_fail(exposure_time);
 
        *exposure_time = g_strdup(_image->exposure_time);
 
@@ -116,7 +130,9 @@ int image_meta_get_exposure_time(image_meta_h image, char **exposure_time)
 int image_meta_get_fnumber(image_meta_h image, double *fnumber)
 {
        image_meta_s *_image = (image_meta_s*)image;
-       content_retvm_if(!_image || !fnumber, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid parameter");
+
+       content_retip_if_fail(image);
+       content_retip_if_fail(fnumber);
 
        *fnumber = _image->fnumber;
 
@@ -126,7 +142,9 @@ int image_meta_get_fnumber(image_meta_h image, double *fnumber)
 int image_meta_get_iso(image_meta_h image, int *iso)
 {
        image_meta_s *_image = (image_meta_s*)image;
-       content_retvm_if(!_image || !iso, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid parameter");
+
+       content_retip_if_fail(image);
+       content_retip_if_fail(iso);
 
        *iso = _image->iso;
 
@@ -136,7 +154,9 @@ int image_meta_get_iso(image_meta_h image, int *iso)
 int image_meta_get_model(image_meta_h image, char **model)
 {
        image_meta_s *_image = (image_meta_s*)image;
-       content_retvm_if(!_image || !model, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid parameter");
+
+       content_retip_if_fail(image);
+       content_retip_if_fail(model);
 
        *model = g_strdup(_image->model);
 
@@ -147,7 +167,8 @@ int image_meta_set_orientation(image_meta_h image, media_content_orientation_e o
 {
        content_warn("DEPRECATION WARNING: image_meta_set_orientation() is deprecated and will be removed from next release.");
        image_meta_s *_image = (image_meta_s*)image;
-       content_retvm_if(!_image, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid parameter");
+
+       content_retip_if_fail(image);
        content_retvm_if(orientation < MEDIA_CONTENT_ORIENTATION_NOT_AVAILABLE || orientation > MEDIA_CONTENT_ORIENTATION_ROT_270, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid orientation");
 
        _image->orientation = orientation;
@@ -162,14 +183,15 @@ int image_meta_update_to_db(image_meta_h image)
        image_meta_s *_image = (image_meta_s*)image;
        char *sql = NULL;
 
-       content_retvm_if(!_image || !STRING_VALID(_image->media_id), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid parameter");
+       content_retip_if_fail(image);
+       content_retip_if_fail(STRING_VALID(_image->media_id));
 
 #ifdef _USE_TVPD_MODE
                char *storage_id = NULL;
                ret = _media_db_get_storage_id_by_media_id(_image->media_id, &storage_id);
                content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
                sql = sqlite3_mprintf(UPDATE_IMAGE_META_FROM_MEDIA, storage_id, _image->orientation, _image->media_id);
-               SAFE_FREE(storage_id);
+               g_free(storage_id);
 #else
                sql = sqlite3_mprintf(UPDATE_IMAGE_META_FROM_MEDIA, _image->orientation, _image->media_id);
 #endif