Merge branch 'tizen' of ssh://review.tizen.org:29418/platform/core/api/thumbnail...

Signed-off-by: Minje Ahn <minje.ahn@samsung.com>
Conflicts:
	src/thumbnail_util.c

Change-Id: Ib3704163da64984fe068d87819b1980801a30dec

diff --cc include/thumbnail_util_private.h
Simple merge

diff --cc packaging/capi-media-thumbnail-util.spec
Simple merge

diff --cc src/thumbnail_util.c
index f7e3e2c,65c7de1..8266e3c
--- 1/src/thumbnail_util.c
--- 2/src/thumbnail_util.c
+++ b/src/thumbnail_util.c
@@@ -96,10 -91,8 +91,8 @@@ int thumbnail_util_extract(thumbnail_h 
                        _thumb->dst_height = 240;
                }
  
 -              ret = thumbnail_request_extract_raw_data_async(_thumb->request_id, _thumb->file_path, _thumb->dst_width, _thumb->dst_height, (ThumbRawFunc)__thumbnail_util_extract_completed_cb, (void *)_thumb_cb);
 +              ret = thumbnail_request_extract_raw_data_async(_thumb->request_id, _thumb->file_path, _thumb->dst_width, _thumb->dst_height, (ThumbRawFunc)__thumbnail_util_extract_completed_cb, (void *)_thumb_cb, tzplatform_getuid(TZ_USER_NAME));
-       }
-       else
-       {
+       } else {
                thumbnail_util_error("INVALID_PARAMETER(0x%08x)", THUMBNAIL_UTIL_ERROR_INVALID_PARAMETER);
                ret = THUMBNAIL_UTIL_ERROR_INVALID_PARAMETER;
        }
@@@ -149,15 -136,12 +136,12 @@@ int thumbnail_util_set_size(thumbnail_
  int thumbnail_util_cancel(thumbnail_h thumb, const char *request_id)
  {
        int ret = THUMBNAIL_UTIL_ERROR_NONE;
-       thumbnail_s *_thumb = (thumbnail_s*)thumb;
+       thumbnail_s *_thumb = (thumbnail_s *)thumb;
  
-       if(_thumb != NULL && STRING_VALID(request_id))
-       {
+       if (_thumb != NULL && STRING_VALID(request_id)) {
                unsigned int request_id_integer = atoi(request_id);
 -              ret = thumbnail_request_cancel_raw_data(request_id_integer);
 +              ret = thumbnail_request_cancel_raw_data(request_id_integer, tzplatform_getuid(TZ_USER_NAME));
-       }
-       else
-       {
+       } else {
                thumbnail_util_error("INVALID_PARAMETER(0x%08x)", THUMBNAIL_UTIL_ERROR_INVALID_PARAMETER);
                ret = THUMBNAIL_UTIL_ERROR_INVALID_PARAMETER;
        }
@@@ -168,14 -152,11 +152,11 @@@
  int thumbnail_util_cancel_all(thumbnail_h thumb)
  {
        int ret = THUMBNAIL_UTIL_ERROR_NONE;
-       thumbnail_s *_thumb = (thumbnail_s*)thumb;
+       thumbnail_s *_thumb = (thumbnail_s *)thumb;
  
-       if(_thumb != NULL)
-       {
 -      if (_thumb != NULL) {
 -              ret = thumbnail_request_cancel_all(true);
++      if(_thumb != NULL)      {
 +              ret = thumbnail_request_cancel_all(true, tzplatform_getuid(TZ_USER_NAME));
-       }
-       else
-       {
+       } else {
                thumbnail_util_error("INVALID_PARAMETER(0x%08x)", THUMBNAIL_UTIL_ERROR_INVALID_PARAMETER);
                ret = THUMBNAIL_UTIL_ERROR_INVALID_PARAMETER;
        }