emile+ tgv saver - stop using deprecated lz4 functions to remove warnings
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>
Tue, 15 Jan 2019 12:33:05 +0000 (12:33 +0000)
committerJiyoun Park <jy0703.park@samsung.com>
Wed, 16 Jan 2019 04:10:39 +0000 (13:10 +0900)
src/lib/emile/emile_compress.c
src/modules/evas/image_savers/tgv/evas_image_save_tgv.c

index 0d2e605795c6270c1dc4a1bebd71a6d178acb166..e744d3f93f7cb6cdb0c0b3e181e5e4aab0d52067 100644 (file)
@@ -52,9 +52,9 @@ emile_compress(const Eina_Binbuf *data,
    switch (t)
      {
       case EMILE_LZ4:
-        length = LZ4_compress((const char *)eina_binbuf_string_get(data),
-                              compact,
-                              eina_binbuf_length_get(data));
+        length = LZ4_compress_default
+          ((const char *)eina_binbuf_string_get(data), compact,
+           eina_binbuf_length_get(data), length);
         /* It is going to be smaller and should never fail, if it does you are in deep poo. */
         temp = realloc(compact, length);
         if (temp) compact = temp;
@@ -64,9 +64,9 @@ emile_compress(const Eina_Binbuf *data,
         break;
 
       case EMILE_LZ4HC:
-        length = LZ4_compressHC((const char *)eina_binbuf_string_get(data),
-                                compact,
-                                eina_binbuf_length_get(data));
+        length = LZ4_compress_HC
+          ((const char *)eina_binbuf_string_get(data), compact,
+           eina_binbuf_length_get(data), length, 16);
         temp = realloc(compact, length);
         if (temp) compact = temp;
 
index aa0a82b94342a4a50d1e41fd63dcb6ba0a03cb50..9fee4de364d3c15f03913468421c4eb6dacef4a6 100644 (file)
@@ -125,7 +125,8 @@ _save_direct_tgv(RGBA_Image *im, const char *file, int compress)
         buffer_size = LZ4_compressBound(etc_data_size);
         buffer = malloc(buffer_size);
         if (!buffer) goto on_error;
-        data_size = LZ4_compressHC((char *) data, (char *) buffer, etc_data_size);
+        data_size = LZ4_compress_HC
+          ((char *)data, (char *)buffer, etc_data_size, buffer_size, 16);
      }
    else
      {
@@ -486,8 +487,11 @@ evas_image_save_file_tgv(RGBA_Image *im,
 
                   if (compress)
                     {
-                       wlen = LZ4_compressHC((char *) buffer, (char *) comp,
-                                             block_count * etc_block_size);
+                       wlen = LZ4_compress_HC
+                         ((char *)buffer, (char *)comp,
+                          block_count * etc_block_size,
+                          LZ4_compressBound(block_count * etc_block_size),
+                          16);
                     }
                   else
                     {