summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaejeong Kim <backto.kim@samsung.com>2017-06-21 03:30:16 (GMT)
committerHaejeong Kim <backto.kim@samsung.com>2017-06-21 03:30:16 (GMT)
commit8ecadd7637f7da73ae44b691a1727208fecc145b (patch)
tree7a536c2d83322f317d282c15f4bb2cd51fb1ebf3
parent1302749f9709ea9e9cd9cd65380a409a472069cb (diff)
downloadlibmedia-thumbnail-8ecadd7637f7da73ae44b691a1727208fecc145b.zip
libmedia-thumbnail-8ecadd7637f7da73ae44b691a1727208fecc145b.tar.gz
libmedia-thumbnail-8ecadd7637f7da73ae44b691a1727208fecc145b.tar.bz2
Change-Id: I5b268111167b31d70835835234bb9c9a19b44d5a
-rwxr-xr-xserver/thumb-server-internal.c6
-rwxr-xr-xsrc/codec/img-codec-parser.c4
-rwxr-xr-xsrc/media-thumb-internal.c2
-rwxr-xr-xsrc/util/media-thumb-util.c2
4 files changed, 7 insertions, 7 deletions
diff --git a/server/thumb-server-internal.c b/server/thumb-server-internal.c
index 58c8c76..58e9df3 100755
--- a/server/thumb-server-internal.c
+++ b/server/thumb-server-internal.c
@@ -117,7 +117,7 @@ gboolean _thumb_server_read_socket(GIOChannel *src,
client_addr_len = sizeof(client_addr);
if ((client_sock = accept(sock, (struct sockaddr*)&client_addr, &client_addr_len)) < 0) {
- thumb_stderror("accept failed : %s");
+ thumb_stderror("accept failed");
return TRUE;
}
@@ -168,7 +168,7 @@ gboolean _thumb_server_read_socket(GIOChannel *src,
block_size = buf_size;
}
if (send(client_sock, buf+sending_block, block_size, 0) != block_size) {
- thumb_stderror("sendto failed : %s");
+ thumb_stderror("sendto failed");
}
sending_block += block_size;
buf_size -= block_size;
@@ -331,7 +331,7 @@ int _thumbnail_get_data(const char *origin_path,
if (alpha) *alpha = thumb_info.alpha;
if (is_saved) *is_saved = thumb_info.is_saved;
- thumb_dbg("Thumb data is generated successfully (Size:%d, W:%d, H:%d) 0x%x", *size, *width, *height, *data);
+ thumb_dbg("Thumb data is generated successfully (Size:%d, W:%d, H:%d) %p", *size, *width, *height, *data);
return MS_MEDIA_ERR_NONE;
}
diff --git a/src/codec/img-codec-parser.c b/src/codec/img-codec-parser.c
index 2b50e3a..70f9587 100755
--- a/src/codec/img-codec-parser.c
+++ b/src/codec/img-codec-parser.c
@@ -422,11 +422,11 @@ static int _ImgGetImageInfo(HFile hFile, unsigned long fileSize, char *fileExt,
#if 1
if (imagecount == 0) {
/* Regard the width/height of the first image block as the size of thumbnails. */
- int img_block_w, img_block_h;
+ int img_block_w = 0, img_block_h = 0;
img_block_w = EncodedDataBuffer[ifegstreamctrl.buffpos + 4] |(EncodedDataBuffer[ifegstreamctrl.buffpos + 5] << 8);
img_block_h = EncodedDataBuffer[ifegstreamctrl.buffpos + 6] |(EncodedDataBuffer[ifegstreamctrl.buffpos + 7] << 8);
- thumb_dbg("Image block width : %d, Height : %d, left : %d, top : %d", img_block_w, img_block_h);
+ thumb_dbg("Image block width : %d, Height : %d", img_block_w, img_block_h);
*pWidth = img_block_w;
*pHeight = img_block_h;
diff --git a/src/media-thumb-internal.c b/src/media-thumb-internal.c
index 9debe27..ed85c68 100755
--- a/src/media-thumb-internal.c
+++ b/src/media-thumb-internal.c
@@ -1146,7 +1146,7 @@ int _media_thumb_video(const char *origin_path,
thumb_dbg("video width: %d", width);
thumb_dbg("video height: %d", height);
thumb_dbg("thumbnail size: %d", size);
- thumb_dbg("frame: 0x%x", frame);
+ thumb_dbg("frame: %p", frame);
thumb_dbg("orientation: %d", rot_type);
if (frame == NULL || width == 0 || height == 0) {
diff --git a/src/util/media-thumb-util.c b/src/util/media-thumb-util.c
index b026ce9..5c4afb7 100755
--- a/src/util/media-thumb-util.c
+++ b/src/util/media-thumb-util.c
@@ -100,7 +100,7 @@ int _media_thumb_remove_file(const char *path)
thumb_dbg("success to remove file");
return TRUE;
} else {
- thumb_stderror("fail to remove file[%s] result");
+ thumb_stderror("fail to remove file");
return FALSE;
}
}