summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2014-12-10 14:34:42 +0100
committerStefan Schmidt <s.schmidt@samsung.com>2014-12-10 14:52:58 +0100
commit6b27d7add27c69bb45da04cf78c7f3a8b51e1324 (patch)
tree0837f88631c43235fa7ce2b800d546984b35ba1a /src/lib
parent2e977a1e50ef4265aaa3e3212f6ed8b46015758a (diff)
eet: Switch from obsolete LZ4_uncompress function to LZ4_decompress_fast
The function is declared as obsolete and in some newer headers it is no longer defined. The new function is the same besides the name change.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/eet/eet_image.c12
-rw-r--r--src/lib/eet/eet_lib.c6
2 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/eet/eet_image.c b/src/lib/eet/eet_image.c
index 1103893c62..bdac8f8d94 100644
--- a/src/lib/eet/eet_image.c
+++ b/src/lib/eet/eet_image.c
@@ -945,8 +945,8 @@ eet_data_image_etc2_decode(const void *data,
945 945
946 if (compress) 946 if (compress)
947 { 947 {
948 expand_length = LZ4_uncompress(data_start, buffer, 948 expand_length = LZ4_decompress_fast(data_start, buffer,
949 block_count * etc_block_size); 949 block_count * etc_block_size);
950 // That's an overhead for now, need to be fixed 950 // That's an overhead for now, need to be fixed
951 if (expand_length != block_length) 951 if (expand_length != block_length)
952 goto on_error; 952 goto on_error;
@@ -2465,8 +2465,8 @@ _eet_data_image_decode_inside(const void *data,
2465 { 2465 {
2466 case EET_COMPRESSION_VERYFAST: 2466 case EET_COMPRESSION_VERYFAST:
2467 case EET_COMPRESSION_SUPERFAST: 2467 case EET_COMPRESSION_SUPERFAST:
2468 if (LZ4_uncompress((const char *)body, 2468 if (LZ4_decompress_fast((const char *)body,
2469 (char *)d, w * h * 4) 2469 (char *)d, w * h * 4)
2470 != (size - 32)) return 0; 2470 != (size - 32)) return 0;
2471 break; 2471 break;
2472 default: 2472 default:
@@ -2491,8 +2491,8 @@ _eet_data_image_decode_inside(const void *data,
2491 2491
2492 dtmp = malloc(src_w * src_h * 4); 2492 dtmp = malloc(src_w * src_h * 4);
2493 if (!dtmp) return 0; 2493 if (!dtmp) return 0;
2494 if (LZ4_uncompress((const char *)body, 2494 if (LZ4_decompress_fast((const char *)body,
2495 dtmp, w * h * 4) 2495 dtmp, w * h * 4)
2496 != (size - 32)) 2496 != (size - 32))
2497 { 2497 {
2498 free(dtmp); 2498 free(dtmp);
diff --git a/src/lib/eet/eet_lib.c b/src/lib/eet/eet_lib.c
index ed610f6adc..dcf11e936d 100644
--- a/src/lib/eet/eet_lib.c
+++ b/src/lib/eet/eet_lib.c
@@ -2034,7 +2034,7 @@ eet_read_cipher(Eet_File *ef,
2034 { 2034 {
2035 case EET_COMPRESSION_VERYFAST: 2035 case EET_COMPRESSION_VERYFAST:
2036 case EET_COMPRESSION_SUPERFAST: 2036 case EET_COMPRESSION_SUPERFAST:
2037 ret = LZ4_uncompress(tmp_data, data, dlen); 2037 ret = LZ4_decompress_fast(tmp_data, data, dlen);
2038 if (ret != compr_size) 2038 if (ret != compr_size)
2039 { 2039 {
2040 if (free_tmp) 2040 if (free_tmp)
@@ -2153,7 +2153,7 @@ eet_read_direct(Eet_File *ef,
2153 { 2153 {
2154 case EET_COMPRESSION_VERYFAST: 2154 case EET_COMPRESSION_VERYFAST:
2155 case EET_COMPRESSION_SUPERFAST: 2155 case EET_COMPRESSION_SUPERFAST:
2156 ret = LZ4_uncompress(data, tmp, size); 2156 ret = LZ4_decompress_fast(data, tmp, size);
2157 if (ret != compr_size) 2157 if (ret != compr_size)
2158 { 2158 {
2159 free(tmp); 2159 free(tmp);
@@ -2268,7 +2268,7 @@ eet_alias_get(Eet_File *ef,
2268 { 2268 {
2269 case EET_COMPRESSION_VERYFAST: 2269 case EET_COMPRESSION_VERYFAST:
2270 case EET_COMPRESSION_SUPERFAST: 2270 case EET_COMPRESSION_SUPERFAST:
2271 ret = LZ4_uncompress(data, tmp, size); 2271 ret = LZ4_decompress_fast(data, tmp, size);
2272 if (ret != compr_size) 2272 if (ret != compr_size)
2273 { 2273 {
2274 free(tmp); 2274 free(tmp);