eet: Switch from obsolete LZ4_uncompress function to LZ4_decompress_fast
authorStefan Schmidt <s.schmidt@samsung.com>
Wed, 10 Dec 2014 13:34:42 +0000 (14:34 +0100)
committerStefan Schmidt <s.schmidt@samsung.com>
Wed, 10 Dec 2014 13:52:58 +0000 (14:52 +0100)
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.

src/lib/eet/eet_image.c
src/lib/eet/eet_lib.c

index 1103893c62825519012abb443dc2eb0962db1fd3..bdac8f8d94410947fd88e62fa491aefcf1a09c63 100644 (file)
@@ -945,8 +945,8 @@ eet_data_image_etc2_decode(const void *data,
 
             if (compress)
               {
-                 expand_length = LZ4_uncompress(data_start, buffer,
-                                                block_count * etc_block_size);
+                 expand_length = LZ4_decompress_fast(data_start, buffer,
+                                                     block_count * etc_block_size);
                  // That's an overhead for now, need to be fixed
                  if (expand_length != block_length)
                    goto on_error;
@@ -2465,8 +2465,8 @@ _eet_data_image_decode_inside(const void   *data,
                     {
                      case EET_COMPRESSION_VERYFAST:
                      case EET_COMPRESSION_SUPERFAST:
-                       if (LZ4_uncompress((const char *)body,
-                                          (char *)d, w * h * 4)
+                       if (LZ4_decompress_fast((const char *)body,
+                                               (char *)d, w * h * 4)
                            != (size - 32)) return 0;
                        break;
                      default:
@@ -2491,8 +2491,8 @@ _eet_data_image_decode_inside(const void   *data,
                             
                             dtmp = malloc(src_w * src_h * 4);
                             if (!dtmp) return 0;
-                            if (LZ4_uncompress((const char *)body,
-                                               dtmp, w * h * 4)
+                            if (LZ4_decompress_fast((const char *)body,
+                                                    dtmp, w * h * 4)
                                 != (size - 32))
                               {
                                  free(dtmp);
index ed610f6adc78c75c602e6fcecf87d73385706bb0..dcf11e936dbe7ca12e7db7237255e54d6bc95247 100644 (file)
@@ -2034,7 +2034,7 @@ eet_read_cipher(Eet_File   *ef,
           {
            case EET_COMPRESSION_VERYFAST:
            case EET_COMPRESSION_SUPERFAST:
-             ret = LZ4_uncompress(tmp_data, data, dlen);
+             ret = LZ4_decompress_fast(tmp_data, data, dlen);
              if (ret != compr_size)
                {
                   if (free_tmp)
@@ -2153,7 +2153,7 @@ eet_read_direct(Eet_File   *ef,
                {
                 case EET_COMPRESSION_VERYFAST:
                 case EET_COMPRESSION_SUPERFAST:
-                  ret = LZ4_uncompress(data, tmp, size);
+                  ret = LZ4_decompress_fast(data, tmp, size);
                   if (ret != compr_size)
                     {
                        free(tmp);
@@ -2268,7 +2268,7 @@ eet_alias_get(Eet_File   *ef,
           {
            case EET_COMPRESSION_VERYFAST:
            case EET_COMPRESSION_SUPERFAST:
-             ret = LZ4_uncompress(data, tmp, size);
+             ret = LZ4_decompress_fast(data, tmp, size);
              if (ret != compr_size)
                {
                   free(tmp);