FreeImage updated to 3.15.4

removed not used formats

git-svn-id: http://svn.miranda-ng.org/main/trunk@2926 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 11 insertions, 11 deletions

diff --git a/plugins/AdvaImg/src/LibPNG/pngwutil.c b/plugins/AdvaImg/src/LibPNG/pngwutil.c
index 64888f7c6c..3cef5b295d 100644
--- a/plugins/AdvaImg/src/LibPNG/pngwutil.c
+++ b/plugins/AdvaImg/src/LibPNG/pngwutil.c
@@ -1,8 +1,8 @@
 

 /* pngwutil.c - utilities to write a PNG file

  *

- * Last changed in libpng 1.5.6 [November 3, 2011]

- * Copyright (c) 1998-2011 Glenn Randers-Pehrson

+ * Last changed in libpng 1.5.10 [March 8, 2012]

+ * Copyright (c) 1998-2012 Glenn Randers-Pehrson

  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)

  *

@@ -569,14 +569,15 @@ png_text_compress(png_structp png_ptr,
 

 /* Ship the compressed text out via chunk writes */

 static void /* PRIVATE */

-png_write_compressed_data_out(png_structp png_ptr, compression_state *comp)

+png_write_compressed_data_out(png_structp png_ptr, compression_state *comp,

+   png_size_t data_len)

 {

    int i;

 

    /* Handle the no-compression case */

    if (comp->input)

    {

-      png_write_chunk_data(png_ptr, comp->input, comp->input_len);

+      png_write_chunk_data(png_ptr, comp->input, data_len);

 

       return;

    }

@@ -585,7 +586,7 @@ png_write_compressed_data_out(png_structp png_ptr, compression_state *comp)
    /* The zbuf_size test is because the code below doesn't work if zbuf_size is

     * '1'; simply skip it to avoid memory overwrite.

     */

-   if (comp->input_len >= 2 && comp->input_len < 16384 && png_ptr->zbuf_size > 1)

+   if (data_len >= 2 && comp->input_len < 16384 && png_ptr->zbuf_size > 1)

    {

       unsigned int z_cmf;  /* zlib compression method and flags */

 

@@ -1164,8 +1165,7 @@ png_write_iCCP(png_structp png_ptr, png_const_charp name, int compression_type,
 

    if (profile_len)

    {

-      comp.input_len = profile_len;

-      png_write_compressed_data_out(png_ptr, &comp);

+      png_write_compressed_data_out(png_ptr, &comp, profile_len);

    }

 

    png_write_chunk_end(png_ptr);

@@ -1370,7 +1370,8 @@ png_write_tRNS(png_structp png_ptr, png_const_bytep trans_alpha,
       }

 

       /* Write the chunk out as it is */

-      png_write_complete_chunk(png_ptr, png_tRNS, trans_alpha, (png_size_t)num_trans);

+      png_write_complete_chunk(png_ptr, png_tRNS, trans_alpha,

+         (png_size_t)num_trans);

    }

 

    else if (color_type == PNG_COLOR_TYPE_GRAY)

@@ -1735,8 +1736,7 @@ png_write_zTXt(png_structp png_ptr, png_const_charp key, png_const_charp text,
    png_write_chunk_data(png_ptr, &buf, (png_size_t)1);

 

    /* Write the compressed data */

-   comp.input_len = text_len;

-   png_write_compressed_data_out(png_ptr, &comp);

+   png_write_compressed_data_out(png_ptr, &comp, text_len);

 

    /* Close the chunk */

    png_write_chunk_end(png_ptr);

@@ -1827,7 +1827,7 @@ png_write_iTXt(png_structp png_ptr, int compression, png_const_charp key,
    png_write_chunk_data(png_ptr, (lang_key ? (png_const_bytep)lang_key : cbuf),

        (png_size_t)(lang_key_len + 1));

 

-   png_write_compressed_data_out(png_ptr, &comp);

+   png_write_compressed_data_out(png_ptr, &comp, text_len);

 

    png_write_chunk_end(png_ptr);