diff options
author | Minje Ahn <minje.ahn@samsung.com> | 2015-07-20 18:47:25 +0900 |
---|---|---|
committer | Minje Ahn <minje.ahn@samsung.com> | 2015-07-20 18:47:25 +0900 |
commit | 318ec49c458b8f7acef0c192d046074250ebe231 (patch) | |
tree | c3f77b8f0a7ad2ce7ea6265656abdc3f72b0225b /src/include | |
parent | 64959fbc53fd5386a684928617353a9be4890439 (diff) | |
download | libmedia-thumbnail-318ec49c458b8f7acef0c192d046074250ebe231.tar.gz libmedia-thumbnail-318ec49c458b8f7acef0c192d046074250ebe231.tar.bz2 libmedia-thumbnail-318ec49c458b8f7acef0c192d046074250ebe231.zip |
Fix socket bind bug.submit/tizen/20150721.075626accepted/tizen/wearable/20150721.092419accepted/tizen/tv/20150721.092304accepted/tizen/mobile/20150721.092123
Fix gdkpixbuf issue.
replace some function.
Change-Id: I3176594d491f9ae1ef08cf7de46a0b791e09e231
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>
Diffstat (limited to 'src/include')
-rwxr-xr-x | src/include/ipc/media-thumb-ipc.h | 10 | ||||
-rwxr-xr-x | src/include/media-thumb-internal.h | 3 | ||||
-rwxr-xr-x | src/include/util/media-thumb-debug.h | 21 | ||||
-rwxr-xr-x | src/include/util/media-thumb-util.h | 20 |
4 files changed, 11 insertions, 43 deletions
diff --git a/src/include/ipc/media-thumb-ipc.h b/src/include/ipc/media-thumb-ipc.h index ea07e5e..fcd4560 100755 --- a/src/include/ipc/media-thumb-ipc.h +++ b/src/include/ipc/media-thumb-ipc.h @@ -21,6 +21,7 @@ #include <sys/un.h> +#include <sys/stat.h> #include <arpa/inet.h> #include <stdlib.h> #include <string.h> @@ -60,11 +61,6 @@ enum { THUMB_FAIL }; - -int _media_thumb_create_socket(int sock_type, int *sock); - -int _media_thumb_create_udp_socket(int *sock); - int _media_thumb_recv_msg(int sock, int header_size, thumbMsg *msg); int _media_thumb_recv_udp_msg(int sock, int header_size, thumbMsg *msg, struct sockaddr_un *from_addr, unsigned int *from_size); @@ -97,8 +93,4 @@ int _media_thumb_request_raw_data_async(int msg_type, thumbRawUserData *userData, uid_t uid); -int _media_thumb_process(thumbMsg *req_msg, thumbMsg *res_msg, uid_t uid); - -int _media_thumb_process_raw(thumbMsg *req_msg, thumbMsg *res_msg, thumbRawAddMsg *res_raw_msg, uid_t uid); - #endif /*_MEDIA_THUMB_IPC_H_*/ diff --git a/src/include/media-thumb-internal.h b/src/include/media-thumb-internal.h index 151836a..0ab9eb7 100755 --- a/src/include/media-thumb-internal.h +++ b/src/include/media-thumb-internal.h @@ -22,6 +22,7 @@ #include <stdbool.h> #include <media-util-err.h> #include "media-thumbnail.h" +#include "media-thumb-util.h" #include "media-thumb-types.h" #include "media-thumb-debug.h" #include <gdk-pixbuf/gdk-pixbuf.h> @@ -75,7 +76,7 @@ int _media_thumb_image(const char *origin_path, int thumb_width, int thumb_height, media_thumb_format format, - media_thumb_info *thumb_info, + media_thumb_info *thumb_info, bool is_raw, uid_t uid); diff --git a/src/include/util/media-thumb-debug.h b/src/include/util/media-thumb-debug.h index f14ea11..3044fc4 100755 --- a/src/include/util/media-thumb-debug.h +++ b/src/include/util/media-thumb-debug.h @@ -36,11 +36,6 @@ #define LOG_TAG "MEDIA_THUMBNAIL" -static pid_t gettid(void) -{ - return syscall(__NR_gettid); -} - #define FONT_COLOR_RESET "\033[0m" #define FONT_COLOR_RED "\033[31m" #define FONT_COLOR_GREEN "\033[32m" @@ -51,31 +46,31 @@ static pid_t gettid(void) #define FONT_COLOR_GRAY "\033[37m" #define thumb_dbg(fmt, arg...) do{ \ - LOGD(FONT_COLOR_RESET"[%d] " fmt "\n", gettid(), ##arg); \ + LOGD(FONT_COLOR_RESET fmt "\n", ##arg); \ } while(0) #define thumb_warn(fmt, arg...) do{ \ - LOGW(FONT_COLOR_GREEN"[%d] " fmt "\n", gettid(), ##arg); \ + LOGW(FONT_COLOR_GREEN fmt "\n", ##arg); \ } while(0) #define thumb_err(fmt, arg...) do{ \ - LOGE(FONT_COLOR_RED"[%d] " fmt "\n", gettid(), ##arg); \ + LOGE(FONT_COLOR_RED fmt "\n", ##arg); \ } while(0) #define thumb_dbg_slog(fmt, arg...) do{ \ - SECURE_LOGD(FONT_COLOR_RESET"[%d] " fmt "\n", gettid(), ##arg); \ + SECURE_LOGD(FONT_COLOR_RESET fmt "\n", ##arg); \ } while(0) #define thumb_warn_slog(fmt, arg...) do{ \ - SECURE_LOGW(FONT_COLOR_GREEN"[%d] " fmt "\n", gettid(), ##arg); \ + SECURE_LOGW(FONT_COLOR_GREEN fmt "\n", ##arg); \ } while(0) #define ERR_BUF_LENGHT 256 #define thumb_stderror(fmt) do { \ - char buf[ERR_BUF_LENGHT] = {0,}; \ - strerror_r(errno, buf, ERR_BUF_LENGHT); \ - LOGE(FONT_COLOR_RED fmt" : standard error [%s]", buf); \ + char thumb_stderror_buffer[ERR_BUF_LENGHT] = {0,}; \ + strerror_r(errno, thumb_stderror_buffer, ERR_BUF_LENGHT); \ + LOGE(FONT_COLOR_RED fmt" : standard error [%s]", thumb_stderror_buffer); \ } while (0) #ifdef _USE_LOG_FILE_ diff --git a/src/include/util/media-thumb-util.h b/src/include/util/media-thumb-util.h index cb93115..bee3b44 100755 --- a/src/include/util/media-thumb-util.h +++ b/src/include/util/media-thumb-util.h @@ -72,25 +72,5 @@ int _media_thumb_get_width(media_thumb_type thumb_type); int _media_thumb_get_height(media_thumb_type thumb_type); -int _thumbnail_get_data(const char *origin_path, - media_thumb_type thumb_type, - media_thumb_format format, - unsigned char **data, - int *size, - int *width, - int *height, - int *origin_width, - int *origin_height, - int *alpha, - uid_t uid); - -int _thumbnail_get_raw_data(const char *origin_path, - media_thumb_format format, - unsigned char **data, - int *size, - int *width, - int *height, - uid_t uid); - #endif /*_MEDIA_THUMB_UTIL_H_*/ |