summaryrefslogtreecommitdiff
path: root/src/lib/emile
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2015-03-17 08:50:50 +0100
committerCedric BAIL <cedric@osg.samsung.com>2015-03-17 09:58:20 +0100
commit90d8932a032f027169a9aa922562c339ede9a2b6 (patch)
tree67db07abc89ba612e205c5e15f5b506e3ac19ac0 /src/lib/emile
parent75cd6d3628d62f0ecf11875112d2ce3131f799e4 (diff)
emile: remove binbuf from emile compression functions.
Diffstat (limited to 'src/lib/emile')
-rw-r--r--src/lib/emile/emile_compress.c16
-rw-r--r--src/lib/emile/emile_compress.h18
-rw-r--r--src/lib/emile/emile_image.c2
3 files changed, 18 insertions, 18 deletions
diff --git a/src/lib/emile/emile_compress.c b/src/lib/emile/emile_compress.c
index 6f7ac583df..11a3b4630c 100644
--- a/src/lib/emile/emile_compress.c
+++ b/src/lib/emile/emile_compress.c
@@ -32,9 +32,9 @@ _emile_compress_buffer_size(const Eina_Binbuf *data, Emile_Compressor_Type t)
32} 32}
33 33
34EAPI Eina_Binbuf * 34EAPI Eina_Binbuf *
35emile_binbuf_compress(const Eina_Binbuf *data, 35emile_compress(const Eina_Binbuf *data,
36 Emile_Compressor_Type t, 36 Emile_Compressor_Type t,
37 Emile_Compressor_Level l) 37 Emile_Compressor_Level l)
38{ 38{
39 void *compact; 39 void *compact;
40 int length; 40 int length;
@@ -79,9 +79,9 @@ emile_binbuf_compress(const Eina_Binbuf *data,
79} 79}
80 80
81EAPI Eina_Bool 81EAPI Eina_Bool
82emile_binbuf_expand(const Eina_Binbuf *in, 82emile_expand(const Eina_Binbuf *in,
83 Eina_Binbuf *out, 83 Eina_Binbuf *out,
84 Emile_Compressor_Type t) 84 Emile_Compressor_Type t)
85{ 85{
86 if (!in || !out) return EINA_FALSE; 86 if (!in || !out) return EINA_FALSE;
87 87
@@ -117,7 +117,7 @@ emile_binbuf_expand(const Eina_Binbuf *in,
117} 117}
118 118
119EAPI Eina_Binbuf * 119EAPI Eina_Binbuf *
120emile_binbuf_uncompress(const Eina_Binbuf *data, Emile_Compressor_Type t, unsigned int dest_length) 120emile_decompress(const Eina_Binbuf *data, Emile_Compressor_Type t, unsigned int dest_length)
121{ 121{
122 Eina_Binbuf *out; 122 Eina_Binbuf *out;
123 void *expanded; 123 void *expanded;
@@ -128,7 +128,7 @@ emile_binbuf_uncompress(const Eina_Binbuf *data, Emile_Compressor_Type t, unsign
128 out = eina_binbuf_manage_new_length(expanded, dest_length); 128 out = eina_binbuf_manage_new_length(expanded, dest_length);
129 if (!out) goto on_error; 129 if (!out) goto on_error;
130 130
131 if (!emile_binbuf_expand(data, out, t)) 131 if (!emile_expand(data, out, t))
132 goto on_error; 132 goto on_error;
133 133
134 return out; 134 return out;
diff --git a/src/lib/emile/emile_compress.h b/src/lib/emile/emile_compress.h
index f53201921e..83af4cd30b 100644
--- a/src/lib/emile/emile_compress.h
+++ b/src/lib/emile/emile_compress.h
@@ -51,9 +51,9 @@ typedef enum
51 * 51 *
52 * @since 1.14 52 * @since 1.14
53 */ 53 */
54EAPI Eina_Binbuf *emile_binbuf_compress(const Eina_Binbuf *in, 54EAPI Eina_Binbuf *emile_compress(const Eina_Binbuf *in,
55 Emile_Compressor_Type t, 55 Emile_Compressor_Type t,
56 Emile_Compressor_Level level); 56 Emile_Compressor_Level level);
57/** 57/**
58 * @brief Uncompress a buffer into a newly allocated buffer. 58 * @brief Uncompress a buffer into a newly allocated buffer.
59 * 59 *
@@ -69,9 +69,9 @@ EAPI Eina_Binbuf *emile_binbuf_compress(const Eina_Binbuf *in,
69 * @note That if dest_length doesn't match the expanded data, it will 69 * @note That if dest_length doesn't match the expanded data, it will
70 * just fail and return @c NULL. 70 * just fail and return @c NULL.
71 */ 71 */
72EAPI Eina_Binbuf *emile_binbuf_uncompress(const Eina_Binbuf *in, 72EAPI Eina_Binbuf *emile_decompress(const Eina_Binbuf *in,
73 Emile_Compressor_Type t, 73 Emile_Compressor_Type t,
74 unsigned int dest_length); 74 unsigned int dest_length);
75 75
76/** 76/**
77 * @brief Uncompress a buffer into an existing buffer. 77 * @brief Uncompress a buffer into an existing buffer.
@@ -87,9 +87,9 @@ EAPI Eina_Binbuf *emile_binbuf_uncompress(const Eina_Binbuf *in,
87 * expanded data or it will fail. In case of failure, random garbage 87 * expanded data or it will fail. In case of failure, random garbage
88 * could fill the out buffer. 88 * could fill the out buffer.
89 */ 89 */
90EAPI Eina_Bool emile_binbuf_expand(const Eina_Binbuf *in, 90EAPI Eina_Bool emile_expand(const Eina_Binbuf *in,
91 Eina_Binbuf *out, 91 Eina_Binbuf *out,
92 Emile_Compressor_Type t); 92 Emile_Compressor_Type t);
93/** 93/**
94 * @} 94 * @}
95 */ 95 */
diff --git a/src/lib/emile/emile_image.c b/src/lib/emile/emile_image.c
index d4a2bce321..6ae310681c 100644
--- a/src/lib/emile/emile_image.c
+++ b/src/lib/emile/emile_image.c
@@ -499,7 +499,7 @@ _emile_tgv_data(Emile_Image *image,
499 499
500 if (image->compress) 500 if (image->compress)
501 { 501 {
502 if (!emile_binbuf_expand(data_start, buffer, EMILE_LZ4HC)) 502 if (!emile_expand(data_start, buffer, EMILE_LZ4HC))
503 goto on_error; 503 goto on_error;
504 } 504 }
505 else 505 else