summaryrefslogtreecommitdiffstats
path: root/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngwtran.c
diff options
context:
space:
mode:
Diffstat (limited to 'experimental/tqtinterface/qt4/src/3rdparty/libpng/pngwtran.c')
-rw-r--r--experimental/tqtinterface/qt4/src/3rdparty/libpng/pngwtran.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngwtran.c b/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngwtran.c
index 582c10d51..c28da116b 100644
--- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngwtran.c
+++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngwtran.c
@@ -98,31 +98,31 @@ png_do_pack(png_row_infop row_info, png_bytep row, png_uint_32 bit_depth)
case 1:
{
png_bytep sp, dp;
- int tqmask, v;
+ int mask, v;
png_uint_32 i;
png_uint_32 row_width = row_info->width;
sp = row;
dp = row;
- tqmask = 0x80;
+ mask = 0x80;
v = 0;
for (i = 0; i < row_width; i++)
{
if (*sp != 0)
- v |= tqmask;
+ v |= mask;
sp++;
- if (tqmask > 1)
- tqmask >>= 1;
+ if (mask > 1)
+ mask >>= 1;
else
{
- tqmask = 0x80;
+ mask = 0x80;
*dp = (png_byte)v;
dp++;
v = 0;
}
}
- if (tqmask != 0x80)
+ if (mask != 0x80)
*dp = (png_byte)v;
break;
}
@@ -253,15 +253,15 @@ png_do_shift(png_row_infop row_info, png_bytep row, png_color_8p bit_depth)
{
png_bytep bp = row;
png_uint_32 i;
- png_byte tqmask;
+ png_byte mask;
png_uint_32 row_bytes = row_info->rowbytes;
if (bit_depth->gray == 1 && row_info->bit_depth == 2)
- tqmask = 0x55;
+ mask = 0x55;
else if (row_info->bit_depth == 4 && bit_depth->gray == 3)
- tqmask = 0x11;
+ mask = 0x11;
else
- tqmask = 0xff;
+ mask = 0xff;
for (i = 0; i < row_bytes; i++, bp++)
{
@@ -275,7 +275,7 @@ png_do_shift(png_row_infop row_info, png_bytep row, png_color_8p bit_depth)
if (j > 0)
*bp |= (png_byte)((v << j) & 0xff);
else
- *bp |= (png_byte)((v >> (-j)) & tqmask);
+ *bp |= (png_byte)((v >> (-j)) & mask);
}
}
}