diff options
Diffstat (limited to 'experimental/tqtinterface/qt4/src/3rdparty/libpng/pngrutil.c')
| -rw-r--r-- | experimental/tqtinterface/qt4/src/3rdparty/libpng/pngrutil.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngrutil.c b/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngrutil.c index 95df6f274..751b278cc 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngrutil.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngrutil.c @@ -2237,19 +2237,19 @@ png_check_chunk_name(png_structp png_ptr, png_bytep chunk_name) /* Combines the row recently read in with the existing pixels in the row. This routine takes care of alpha and transparency if requested. This routine also handles the two methods of progressive display - of interlaced images, depending on the tqmask value. - The tqmask value describes which pixels are to be combined with + of interlaced images, depending on the mask value. + The mask value describes which pixels are to be combined with the row. The pattern always repeats every 8 pixels, so just 8 bits are needed. A one indicates the pixel is to be combined, a zero indicates the pixel is to be skipped. This is in addition to any alpha or transparency value associated with the pixel. If - you want all pixels to be combined, pass 0xff (255) in tqmask. */ + you want all pixels to be combined, pass 0xff (255) in mask. */ #ifndef PNG_HAVE_ASSEMBLER_COMBINE_ROW void /* PRIVATE */ -png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) +png_combine_row(png_structp png_ptr, png_bytep row, int mask) { png_debug(1,"in png_combine_row\n"); - if (tqmask == 0xff) + if (mask == 0xff) { png_memcpy(row, png_ptr->row_buf + 1, (png_size_t)((png_ptr->width * @@ -2288,7 +2288,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) for (i = 0; i < row_width; i++) { - if (m & tqmask) + if (m & mask) { int value; @@ -2343,7 +2343,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) for (i = 0; i < row_width; i++) { - if (m & tqmask) + if (m & mask) { value = (*sp >> shift) & 0x03; *dp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff); @@ -2394,7 +2394,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) for (i = 0; i < row_width; i++) { - if (m & tqmask) + if (m & mask) { value = (*sp >> shift) & 0xf; *dp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff); @@ -2428,7 +2428,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) for (i = 0; i < row_width; i++) { - if (m & tqmask) + if (m & mask) { png_memcpy(dp, sp, pixel_bytes); } |