summaryrefslogtreecommitdiff
path: root/src/lib/eet
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/eet
parent75cd6d3628d62f0ecf11875112d2ce3131f799e4 (diff)
emile: remove binbuf from emile compression functions.
Diffstat (limited to 'src/lib/eet')
-rw-r--r--src/lib/eet/eet_image.c12
-rw-r--r--src/lib/eet/eet_lib.c26
2 files changed, 19 insertions, 19 deletions
diff --git a/src/lib/eet/eet_image.c b/src/lib/eet/eet_image.c
index 80e07ddc04..2b6b0c0043 100644
--- a/src/lib/eet/eet_image.c
+++ b/src/lib/eet/eet_image.c
@@ -721,7 +721,7 @@ eet_data_image_lossless_compressed_convert(int *size,
721 return NULL; 721 return NULL;
722 } 722 }
723 723
724 out = emile_binbuf_compress(in, eet_2_emile_compressor(compression), compression); 724 out = emile_compress(in, eet_2_emile_compressor(compression), compression);
725 725
726 if (!out || (eina_binbuf_length_get(out) > eina_binbuf_length_get(in))) 726 if (!out || (eina_binbuf_length_get(out) > eina_binbuf_length_get(in)))
727 { 727 {
@@ -1039,7 +1039,7 @@ eet_data_image_etc1_compressed_convert(int *size,
1039 { 1039 {
1040 Eina_Binbuf *out; 1040 Eina_Binbuf *out;
1041 1041
1042 out = emile_binbuf_compress(in, EMILE_LZ4HC, EMILE_COMPRESSOR_BEST); 1042 out = emile_compress(in, EMILE_LZ4HC, EMILE_COMPRESSOR_BEST);
1043 eina_binbuf_free(in); 1043 eina_binbuf_free(in);
1044 in = out; 1044 in = out;
1045 } 1045 }
@@ -1984,7 +1984,7 @@ _eet_data_image_decode_inside(const void *data,
1984 { 1984 {
1985 out = eina_binbuf_manage_read_only_new_length((void*) d, 1985 out = eina_binbuf_manage_read_only_new_length((void*) d,
1986 w * h * 4); 1986 w * h * 4);
1987 if (!emile_binbuf_expand(in, out, 1987 if (!emile_expand(in, out,
1988 eet_2_emile_compressor(comp))) 1988 eet_2_emile_compressor(comp)))
1989 { 1989 {
1990 eina_binbuf_free(in); 1990 eina_binbuf_free(in);
@@ -1996,9 +1996,9 @@ _eet_data_image_decode_inside(const void *data,
1996 { 1996 {
1997 /* FIXME: This could create a huge alloc. So 1997 /* FIXME: This could create a huge alloc. So
1998 compressed data and tile could not always work.*/ 1998 compressed data and tile could not always work.*/
1999 out = emile_binbuf_uncompress(in, 1999 out = emile_decompress(in,
2000 eet_2_emile_compressor(comp), 2000 eet_2_emile_compressor(comp),
2001 w * h * 4); 2001 w * h * 4);
2002 eina_binbuf_free(in); 2002 eina_binbuf_free(in);
2003 if (!out) return 0; 2003 if (!out) return 0;
2004 2004
diff --git a/src/lib/eet/eet_lib.c b/src/lib/eet/eet_lib.c
index b6c1a1676e..a5ef22d18a 100644
--- a/src/lib/eet/eet_lib.c
+++ b/src/lib/eet/eet_lib.c
@@ -1886,9 +1886,9 @@ eet_read_cipher(Eet_File *ef,
1886 { 1886 {
1887 Eina_Binbuf *out; 1887 Eina_Binbuf *out;
1888 1888
1889 out = emile_binbuf_uncompress(in, 1889 out = emile_decompress(in,
1890 eet_2_emile_compressor(efn->compression_type), 1890 eet_2_emile_compressor(efn->compression_type),
1891 efn->data_size); 1891 efn->data_size);
1892 1892
1893 eina_binbuf_free(in); 1893 eina_binbuf_free(in);
1894 if (!out) goto on_error; 1894 if (!out) goto on_error;
@@ -1987,9 +1987,9 @@ eet_read_direct(Eet_File *ef,
1987 in = read_binbuf_from_disk(ef, efn); 1987 in = read_binbuf_from_disk(ef, efn);
1988 if (!in) goto on_error; 1988 if (!in) goto on_error;
1989 1989
1990 out = emile_binbuf_uncompress(in, 1990 out = emile_decompress(in,
1991 eet_2_emile_compressor(efn->compression_type), 1991 eet_2_emile_compressor(efn->compression_type),
1992 efn->data_size); 1992 efn->data_size);
1993 eina_binbuf_free(in); 1993 eina_binbuf_free(in);
1994 if (!out) goto on_error; 1994 if (!out) goto on_error;
1995 1995
@@ -2089,9 +2089,9 @@ eet_alias_get(Eet_File *ef,
2089 in = read_binbuf_from_disk(ef, efn); 2089 in = read_binbuf_from_disk(ef, efn);
2090 if (!in) goto on_error; 2090 if (!in) goto on_error;
2091 2091
2092 out = emile_binbuf_uncompress(in, 2092 out = emile_decompress(in,
2093 eet_2_emile_compressor(efn->compression_type), 2093 eet_2_emile_compressor(efn->compression_type),
2094 efn->data_size); 2094 efn->data_size);
2095 eina_binbuf_free(in); 2095 eina_binbuf_free(in);
2096 if (!out) goto on_error; 2096 if (!out) goto on_error;
2097 2097
@@ -2207,9 +2207,9 @@ eet_alias(Eet_File *ef,
2207 { 2207 {
2208 Eina_Binbuf *out; 2208 Eina_Binbuf *out;
2209 2209
2210 out = emile_binbuf_compress(in, 2210 out = emile_compress(in,
2211 eet_2_emile_compressor(comp), 2211 eet_2_emile_compressor(comp),
2212 EMILE_COMPRESSOR_BEST); 2212 EMILE_COMPRESSOR_BEST);
2213 eina_binbuf_free(in); 2213 eina_binbuf_free(in);
2214 if (!out) goto on_error; 2214 if (!out) goto on_error;
2215 2215
@@ -2327,7 +2327,7 @@ eet_write_cipher(Eet_File *ef,
2327 { 2327 {
2328 Eina_Binbuf *out; 2328 Eina_Binbuf *out;
2329 2329
2330 out = emile_binbuf_compress(in, eet_2_emile_compressor(comp), EMILE_COMPRESSOR_BEST); 2330 out = emile_compress(in, eet_2_emile_compressor(comp), EMILE_COMPRESSOR_BEST);
2331 if (out) 2331 if (out)
2332 { 2332 {
2333 if (eina_binbuf_length_get(out) < eina_binbuf_length_get(in)) 2333 if (eina_binbuf_length_get(out) < eina_binbuf_length_get(in))