1 files changed, 26 insertions, 26 deletions

diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/png.c b/experimental/tqtinterface/qt4/src/3rdparty/libpng/png.c
index d3370d8d7..fc120a2cc 100644
--- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/png.c
+++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/png.c
@@ -301,15 +301,15 @@ png_info_init_3(png_infopp ptr_ptr, png_size_t png_info_struct_size)
 #ifdef PNG_FREE_ME_SUPPORTED
 void PNGAPI
 png_data_freer(png_structp png_ptr, png_infop info_ptr,
-   int freer, png_uint_32 tqmask)
+   int freer, png_uint_32 mask)
 {
    png_debug(1, "in png_data_freer\n");
    if (png_ptr == NULL || info_ptr == NULL)
       return;
    if(freer == PNG_DESTROY_WILL_FREE_DATA)
-      info_ptr->free_me |= tqmask;
+      info_ptr->free_me |= mask;
    else if(freer == PNG_USER_WILL_FREE_DATA)
-      info_ptr->free_me &= ~tqmask;
+      info_ptr->free_me &= ~mask;
    else
       png_warning(png_ptr,
          "Unknown freer parameter in png_data_freer.");
@@ -317,7 +317,7 @@ png_data_freer(png_structp png_ptr, png_infop info_ptr,
 #endif
 
 void PNGAPI
-png_free_data(png_structp png_ptr, png_infop info_ptr, png_uint_32 tqmask,
+png_free_data(png_structp png_ptr, png_infop info_ptr, png_uint_32 mask,
    int num)
 {
    png_debug(1, "in png_free_data\n");
@@ -327,9 +327,9 @@ png_free_data(png_structp png_ptr, png_infop info_ptr, png_uint_32 tqmask,
 #if defined(PNG_TEXT_SUPPORTED)
 /* free text item num or (if num == -1) all text items */
 #ifdef PNG_FREE_ME_SUPPORTED
-if ((tqmask & PNG_FREE_TEXT) & info_ptr->free_me)
+if ((mask & PNG_FREE_TEXT) & info_ptr->free_me)
 #else
-if (tqmask & PNG_FREE_TEXT)
+if (mask & PNG_FREE_TEXT)
 #endif
 {
    if (num != -1)
@@ -355,9 +355,9 @@ if (tqmask & PNG_FREE_TEXT)
 #if defined(PNG_tRNS_SUPPORTED)
 /* free any tRNS entry */
 #ifdef PNG_FREE_ME_SUPPORTED
-if ((tqmask & PNG_FREE_TRNS) & info_ptr->free_me)
+if ((mask & PNG_FREE_TRNS) & info_ptr->free_me)
 #else
-if ((tqmask & PNG_FREE_TRNS) && (png_ptr->flags & PNG_FLAG_FREE_TRNS))
+if ((mask & PNG_FREE_TRNS) && (png_ptr->flags & PNG_FLAG_FREE_TRNS))
 #endif
 {
     png_free(png_ptr, info_ptr->trans);
@@ -372,9 +372,9 @@ if ((tqmask & PNG_FREE_TRNS) && (png_ptr->flags & PNG_FLAG_FREE_TRNS))
 #if defined(PNG_sCAL_SUPPORTED)
 /* free any sCAL entry */
 #ifdef PNG_FREE_ME_SUPPORTED
-if ((tqmask & PNG_FREE_SCAL) & info_ptr->free_me)
+if ((mask & PNG_FREE_SCAL) & info_ptr->free_me)
 #else
-if (tqmask & PNG_FREE_SCAL)
+if (mask & PNG_FREE_SCAL)
 #endif
 {
 #if defined(PNG_FIXED_POINT_SUPPORTED) && !defined(PNG_FLOATING_POINT_SUPPORTED)
@@ -390,9 +390,9 @@ if (tqmask & PNG_FREE_SCAL)
 #if defined(PNG_pCAL_SUPPORTED)
 /* free any pCAL entry */
 #ifdef PNG_FREE_ME_SUPPORTED
-if ((tqmask & PNG_FREE_PCAL) & info_ptr->free_me)
+if ((mask & PNG_FREE_PCAL) & info_ptr->free_me)
 #else
-if (tqmask & PNG_FREE_PCAL)
+if (mask & PNG_FREE_PCAL)
 #endif
 {
     png_free(png_ptr, info_ptr->pcal_purpose);
@@ -417,9 +417,9 @@ if (tqmask & PNG_FREE_PCAL)
 #if defined(PNG_iCCP_SUPPORTED)
 /* free any iCCP entry */
 #ifdef PNG_FREE_ME_SUPPORTED
-if ((tqmask & PNG_FREE_ICCP) & info_ptr->free_me)
+if ((mask & PNG_FREE_ICCP) & info_ptr->free_me)
 #else
-if (tqmask & PNG_FREE_ICCP)
+if (mask & PNG_FREE_ICCP)
 #endif
 {
     png_free(png_ptr, info_ptr->iccp_name);
@@ -433,9 +433,9 @@ if (tqmask & PNG_FREE_ICCP)
 #if defined(PNG_sPLT_SUPPORTED)
 /* free a given sPLT entry, or (if num == -1) all sPLT entries */
 #ifdef PNG_FREE_ME_SUPPORTED
-if ((tqmask & PNG_FREE_SPLT) & info_ptr->free_me)
+if ((mask & PNG_FREE_SPLT) & info_ptr->free_me)
 #else
-if (tqmask & PNG_FREE_SPLT)
+if (mask & PNG_FREE_SPLT)
 #endif
 {
    if (num != -1)
@@ -467,9 +467,9 @@ if (tqmask & PNG_FREE_SPLT)
 
 #if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
 #ifdef PNG_FREE_ME_SUPPORTED
-if ((tqmask & PNG_FREE_UNKN) & info_ptr->free_me)
+if ((mask & PNG_FREE_UNKN) & info_ptr->free_me)
 #else
-if (tqmask & PNG_FREE_UNKN)
+if (mask & PNG_FREE_UNKN)
 #endif
 {
    if (num != -1)
@@ -500,9 +500,9 @@ if (tqmask & PNG_FREE_UNKN)
 #if defined(PNG_hIST_SUPPORTED)
 /* free any hIST entry */
 #ifdef PNG_FREE_ME_SUPPORTED
-if ((tqmask & PNG_FREE_HIST)  & info_ptr->free_me)
+if ((mask & PNG_FREE_HIST)  & info_ptr->free_me)
 #else
-if ((tqmask & PNG_FREE_HIST) && (png_ptr->flags & PNG_FLAG_FREE_HIST))
+if ((mask & PNG_FREE_HIST) && (png_ptr->flags & PNG_FLAG_FREE_HIST))
 #endif
 {
     png_free(png_ptr, info_ptr->hist);
@@ -516,9 +516,9 @@ if ((tqmask & PNG_FREE_HIST) && (png_ptr->flags & PNG_FLAG_FREE_HIST))
 
 /* free any PLTE entry that was internally allocated */
 #ifdef PNG_FREE_ME_SUPPORTED
-if ((tqmask & PNG_FREE_PLTE) & info_ptr->free_me)
+if ((mask & PNG_FREE_PLTE) & info_ptr->free_me)
 #else
-if ((tqmask & PNG_FREE_PLTE) && (png_ptr->flags & PNG_FLAG_FREE_PLTE))
+if ((mask & PNG_FREE_PLTE) && (png_ptr->flags & PNG_FLAG_FREE_PLTE))
 #endif
 {
     png_zfree(png_ptr, info_ptr->palette);
@@ -533,9 +533,9 @@ if ((tqmask & PNG_FREE_PLTE) && (png_ptr->flags & PNG_FLAG_FREE_PLTE))
 #if defined(PNG_INFO_IMAGE_SUPPORTED)
 /* free any image bits attached to the info structure */
 #ifdef PNG_FREE_ME_SUPPORTED
-if ((tqmask & PNG_FREE_ROWS) & info_ptr->free_me)
+if ((mask & PNG_FREE_ROWS) & info_ptr->free_me)
 #else
-if (tqmask & PNG_FREE_ROWS)
+if (mask & PNG_FREE_ROWS)
 #endif
 {
     if(info_ptr->row_pointers)
@@ -555,9 +555,9 @@ if (tqmask & PNG_FREE_ROWS)
 
 #ifdef PNG_FREE_ME_SUPPORTED
    if(num == -1)
-     info_ptr->free_me &= ~tqmask;
+     info_ptr->free_me &= ~mask;
    else
-     info_ptr->free_me &= ~(tqmask & ~PNG_FREE_MUL);
+     info_ptr->free_me &= ~(mask & ~PNG_FREE_MUL);
 #endif
 }