update for zlib & FreeImage

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

1 files changed, 13 insertions, 13 deletions

diff --git a/plugins/FreeImage/Source/LibPNG/pngwtran.c b/plugins/FreeImage/Source/LibPNG/pngwtran.c
index a99cb8ec19..b598149a96 100644
--- a/plugins/FreeImage/Source/LibPNG/pngwtran.c
+++ b/plugins/FreeImage/Source/LibPNG/pngwtran.c
@@ -1,7 +1,7 @@
 

 /* pngwtran.c - transforms the data in a row for PNG writers

  *

- * Last changed in libpng 1.5.4 [July 7, 2011]

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

  * Copyright (c) 1998-2011 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.)

@@ -20,7 +20,7 @@
  * transformations is significant.

  */

 void /* PRIVATE */

-png_do_write_transformations(png_structp png_ptr)

+png_do_write_transformations(png_structp png_ptr, png_row_infop row_info)

 {

    png_debug(1, "in png_do_write_transformations");

 

@@ -32,8 +32,8 @@ png_do_write_transformations(png_structp png_ptr)
       if (png_ptr->write_user_transform_fn != NULL)

          (*(png_ptr->write_user_transform_fn)) /* User write transform

                                                  function */

-             (png_ptr,                    /* png_ptr */

-             &(png_ptr->row_info),           /* row_info: */

+             (png_ptr,  /* png_ptr */

+             row_info,  /* row_info: */

                 /*  png_uint_32 width;       width of row */

                 /*  png_size_t rowbytes;     number of bytes in row */

                 /*  png_byte color_type;     color type of pixels */

@@ -45,50 +45,50 @@ png_do_write_transformations(png_structp png_ptr)
 

 #ifdef PNG_WRITE_FILLER_SUPPORTED

    if (png_ptr->transformations & PNG_FILLER)

-      png_do_strip_channel(&(png_ptr->row_info), png_ptr->row_buf + 1,

+      png_do_strip_channel(row_info, png_ptr->row_buf + 1,

          !(png_ptr->flags & PNG_FLAG_FILLER_AFTER));

 #endif

 

 #ifdef PNG_WRITE_PACKSWAP_SUPPORTED

    if (png_ptr->transformations & PNG_PACKSWAP)

-      png_do_packswap(&(png_ptr->row_info), png_ptr->row_buf + 1);

+      png_do_packswap(row_info, png_ptr->row_buf + 1);

 #endif

 

 #ifdef PNG_WRITE_PACK_SUPPORTED

    if (png_ptr->transformations & PNG_PACK)

-      png_do_pack(&(png_ptr->row_info), png_ptr->row_buf + 1,

+      png_do_pack(row_info, png_ptr->row_buf + 1,

           (png_uint_32)png_ptr->bit_depth);

 #endif

 

 #ifdef PNG_WRITE_SWAP_SUPPORTED

    if (png_ptr->transformations & PNG_SWAP_BYTES)

-      png_do_swap(&(png_ptr->row_info), png_ptr->row_buf + 1);

+      png_do_swap(row_info, png_ptr->row_buf + 1);

 #endif

 

 #ifdef PNG_WRITE_SHIFT_SUPPORTED

    if (png_ptr->transformations & PNG_SHIFT)

-      png_do_shift(&(png_ptr->row_info), png_ptr->row_buf + 1,

+      png_do_shift(row_info, png_ptr->row_buf + 1,

           &(png_ptr->shift));

 #endif

 

 #ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED

    if (png_ptr->transformations & PNG_SWAP_ALPHA)

-      png_do_write_swap_alpha(&(png_ptr->row_info), png_ptr->row_buf + 1);

+      png_do_write_swap_alpha(row_info, png_ptr->row_buf + 1);

 #endif

 

 #ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED

    if (png_ptr->transformations & PNG_INVERT_ALPHA)

-      png_do_write_invert_alpha(&(png_ptr->row_info), png_ptr->row_buf + 1);

+      png_do_write_invert_alpha(row_info, png_ptr->row_buf + 1);

 #endif

 

 #ifdef PNG_WRITE_BGR_SUPPORTED

    if (png_ptr->transformations & PNG_BGR)

-      png_do_bgr(&(png_ptr->row_info), png_ptr->row_buf + 1);

+      png_do_bgr(row_info, png_ptr->row_buf + 1);

 #endif

 

 #ifdef PNG_WRITE_INVERT_SUPPORTED

    if (png_ptr->transformations & PNG_INVERT_MONO)

-      png_do_invert(&(png_ptr->row_info), png_ptr->row_buf + 1);

+      png_do_invert(row_info, png_ptr->row_buf + 1);

 #endif

 }