diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-08-10 12:13:27 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-08-10 12:13:27 -0500 |
| commit | b6c6d9f8dd1221e5d9dc5b674e93797761470024 (patch) | |
| tree | 94563ba51148e9fd71f5c8df86439c84945d5d81 /experimental/tqtinterface/qt4/src/3rdparty/libpng | |
| parent | 03256f3cd5149f3ff5f5f45765b0b0659db4e036 (diff) | |
| download | tde-b6c6d9f8dd1221e5d9dc5b674e93797761470024.tar.gz tde-b6c6d9f8dd1221e5d9dc5b674e93797761470024.zip | |
rename the following methods:
tqparent parent
tqmask mask
Diffstat (limited to 'experimental/tqtinterface/qt4/src/3rdparty/libpng')
20 files changed, 417 insertions, 417 deletions
diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/CHANGES b/experimental/tqtinterface/qt4/src/3rdparty/libpng/CHANGES index 939baebea..d151a41c7 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/CHANGES +++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/CHANGES @@ -185,7 +185,7 @@ version 0.97 [January, 1998] fixed memory leak in pngwrite.c (free info_ptr->text) (Glenn R-P) added more conditions for png_do_background, to avoid changing black pixels to background when a background is supplied and - no pixels are transtqparent + no pixels are transparent repaired PNG_NO_STDIO behaviour tested NODIV support and made it default behaviour (Greg Roelofs) added "-m" option and PNGTEST_DEBUG_MEMORY to pngtest (John Bowler) @@ -747,7 +747,7 @@ version 1.0.7beta12 [May 12, 2000] Made PNG_NO_CONSOLE_IO the default condition when PNG_BUILD_DLL is defined. Use MSC _RPTn debugging instead of fprintf if _MSC_VER is defined. Added png_access_version_number() function. - Check for tqmask&PNG_FREE_CHNK (for TEXT, SCAL, PCAL) in png_free_data(). + Check for mask&PNG_FREE_CHNK (for TEXT, SCAL, PCAL) in png_free_data(). Expanded libpng.3/libpng.txt information about png_data_freer(). version 1.0.7beta14 [May 17, 2000] (beta13 was not published) Changed pnggccrd.c and pngvcrd.c to handle bad adaptive filter types as @@ -1028,7 +1028,7 @@ version 1.2.2beta2 [February 23, 2002] Check for invalid image dimensions in png_get_IHDR. Added missing "fi;" in the install target of the SGI makefiles. Added install-static to all makefiles that make shared libraries. - Always do gamma compensation when image is partially transtqparent. + Always do gamma compensation when image is partially transparent. version 1.2.2beta3 [March 7, 2002] Compute background.gray and background_1.gray even when color_type is RGB in case image gets reduced to gray later. diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/INSTALL b/experimental/tqtinterface/qt4/src/3rdparty/libpng/INSTALL index 93980f33a..1d6dfc5f0 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/INSTALL +++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/INSTALL @@ -15,7 +15,7 @@ or "zlib114") so that you have directories called "zlib" and "libpng". Your directory structure should look like this: - .. (the tqparent directory) + .. (the parent directory) libpng (this directory) INSTALL (this file) README diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/example.c b/experimental/tqtinterface/qt4/src/3rdparty/libpng/example.c index c7ebb4bb2..191d41b3d 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/example.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/example.c @@ -206,7 +206,7 @@ void read_png(FILE *fp, unsigned int sig_read) /* file is already open */ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) png_set_tRNS_to_alpha(png_ptr); - /* Set the background color to draw transtqparent and alpha images over. + /* Set the background color to draw transparent and alpha images over. * It is possible to set the red, green, and blue components directly * for paletted images instead of supplying a palette index. Note that * even if the PNG file supplies a background, you are not required to diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/libpng.3 b/experimental/tqtinterface/qt4/src/3rdparty/libpng/libpng.3 index a0fc097e8..b54b54799 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/libpng.3 +++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/libpng.3 @@ -200,7 +200,7 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.2.5 \fI\fB -\fBpng_uint_32 png_get_mmx_flagtqmask (int \fP\fIflag_select\fP\fB, int \fI*compilerID\fP\fB);\fP +\fBpng_uint_32 png_get_mmx_flagmask (int \fP\fIflag_select\fP\fB, int \fI*compilerID\fP\fB);\fP \fI\fB @@ -526,7 +526,7 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.2.5 \fI\fB -\fBvoid png_set_invalid (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fItqmask\fP\fB);\fP +\fBvoid png_set_invalid (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fImask\fP\fB);\fP \fI\fB @@ -1152,7 +1152,7 @@ dithering, and setting filler.) If this is the case, simply do this: where png_transforms is an integer containing the logical OR of some set of transformation flags. This call is equivalent to png_read_info(), -followed the set of transformations indicated by the transform tqmask, +followed the set of transformations indicated by the transform mask, then png_read_image(), and finally png_read_end(). (The final parameter of this call is not yet used. Someday it might point @@ -1326,12 +1326,12 @@ into the info_ptr is returned for any complex types. png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, &trans_values); - trans - array of transtqparent entries for + trans - array of transparent entries for palette (PNG_INFO_tRNS) trans_values - graylevel or color sample values of - the single transtqparent color for + the single transparent color for non-paletted images (PNG_INFO_tRNS) - num_trans - number of transtqparent entries + num_trans - number of transparent entries (PNG_INFO_tRNS) png_get_hIST(png_ptr, info_ptr, &hist); @@ -1564,7 +1564,7 @@ is the level of opacity. If you need the alpha channel in an image to be the level of transparency instead of opacity, you can invert the alpha channel (or the tRNS chunk data) after it's read, so that 0 is fully opaque and 255 (in 8-bit or paletted images) or 65535 (in 16-bit -images) is fully transtqparent, with +images) is fully transparent, with png_set_invert_alpha(png_ptr); @@ -2003,8 +2003,8 @@ When you are done, you can free all memory allocated by libpng like this: It is also possible to individually free the info_ptr members that point to libpng-allocated storage with the following function: - png_free_data(png_ptr, info_ptr, tqmask, seq) - tqmask - identifies data to be freed, a tqmask + png_free_data(png_ptr, info_ptr, mask, seq) + mask - identifies data to be freed, a mask containing the logical OR of one or more of PNG_FREE_PLTE, PNG_FREE_TRNS, @@ -2022,7 +2022,7 @@ by the user and not by libpng, and will in those cases do nothing. The "seq" parameter is ignored if only one item of the selected data type, such as PLTE, is allowed. If "seq" is not -1, and multiple items are allowed for the data type identified in -the tqmask, such as text or sPLT, only the n'th item in the structure +the mask, such as text or sPLT, only the n'th item in the structure is freed, where n is "seq". The default behavior is only to free data that was allocated internally @@ -2030,8 +2030,8 @@ by libpng. This can be changed, so that libpng will not free the data, or so that it will free data that was allocated by the user with png_malloc() or png_zalloc() and passed in via a png_set_*() function, with - png_data_freer(png_ptr, info_ptr, freer, tqmask) - tqmask - which data elements are affected + png_data_freer(png_ptr, info_ptr, freer, mask) + mask - which data elements are affected same choices as in png_free_data() freer - one of PNG_DESTROY_WILL_FREE_DATA @@ -2065,8 +2065,8 @@ The png_free_data() function will turn off the "valid" flag for anything it frees. If you need to turn the flag off for a chunk that was freed by your application instead of by libpng, you can use - png_set_invalid(png_ptr, info_ptr, tqmask); - tqmask - identifies the chunks to be made invalid, + png_set_invalid(png_ptr, info_ptr, mask); + mask - identifies the chunks to be made invalid, containing the logical OR of one or more of PNG_INFO_gAMA, PNG_INFO_sBIT, @@ -2525,12 +2525,12 @@ Some of the more important parts of the png_info are: png_set_tRNS(png_ptr, info_ptr, trans, num_trans, trans_values); - trans - array of transtqparent entries for + trans - array of transparent entries for palette (PNG_INFO_tRNS) trans_values - graylevel or color sample values of - the single transtqparent color for + the single transparent color for non-paletted images (PNG_INFO_tRNS) - num_trans - number of transtqparent entries + num_trans - number of transparent entries (PNG_INFO_tRNS) png_set_hIST(png_ptr, info_ptr, hist); @@ -2746,7 +2746,7 @@ png_set_rows() to put image data in the info structure), simply do this: where png_transforms is an integer containing the logical OR of some set of transformation flags. This call is equivalent to png_write_info(), -followed the set of transformations indicated by the transform tqmask, +followed the set of transformations indicated by the transform mask, then png_write_image(), and finally png_write_end(). (The final parameter of this call is not yet used. Someday it might point @@ -2764,7 +2764,7 @@ Note that there is one transformation you may need to do before png_write_info(). In PNG files, the alpha channel in an image is the level of opacity. If your data is supplied as a level of transparency, you can invert the alpha channel before you write it, so -that 0 is fully transtqparent and 255 (in 8-bit or paletted images) or +that 0 is fully transparent and 255 (in 8-bit or paletted images) or 65535 (in 16-bit images) is fully opaque, with png_set_invert_alpha(png_ptr); @@ -2773,7 +2773,7 @@ This must appear before png_write_info() instead of later with the other transformations because in the case of paletted images the tRNS chunk data has to be inverted before the tRNS chunk is written. If your image is not a paletted image, the tRNS data (which in such cases -represents a single color to be rendered as transtqparent) won't need to +represents a single color to be rendered as transparent) won't need to be changed, and you can safely do this transformation after your png_write_info() call. @@ -2999,8 +2999,8 @@ When you are done, you can free all memory used by libpng like this: It is also possible to individually free the info_ptr members that point to libpng-allocated storage with the following function: - png_free_data(png_ptr, info_ptr, tqmask, seq) - tqmask - identifies data to be freed, a tqmask + png_free_data(png_ptr, info_ptr, mask, seq) + mask - identifies data to be freed, a mask containing the logical OR of one or more of PNG_FREE_PLTE, PNG_FREE_TRNS, @@ -3018,7 +3018,7 @@ by the user and not by libpng, and will in those cases do nothing. The "seq" parameter is ignored if only one item of the selected data type, such as PLTE, is allowed. If "seq" is not -1, and multiple items are allowed for the data type identified in -the tqmask, such as text or sPLT, only the n'th item in the structure +the mask, such as text or sPLT, only the n'th item in the structure is freed, where n is "seq". If you allocated data such as a palette that you passed @@ -3030,8 +3030,8 @@ by libpng. This can be changed, so that libpng will not free the data, or so that it will free data that was allocated by the user with png_malloc() or png_zalloc() and passed in via a png_set_*() function, with - png_data_freer(png_ptr, info_ptr, freer, tqmask) - tqmask - which data elements are affected + png_data_freer(png_ptr, info_ptr, freer, mask) + mask - which data elements are affected same choices as in png_free_data() freer - one of PNG_DESTROY_WILL_FREE_DATA @@ -3451,7 +3451,7 @@ A new feature in libpng 1.2.0 is the ability to dynamically switch between standard and optimized versions of some routines. Currently these are limited to three computationally intensive tasks when reading PNG files: decoding row filters, expanding interlacing, and combining interlaced or -transtqparent row data with previous row data. Currently the optimized +transparent row data with previous row data. Currently the optimized versions are available only for x86 (Intel, AMD, etc.) platforms with MMX support, though this may change in future versions. (For example, the non-MMX assembler optimizations for zlib might become similarly @@ -3468,32 +3468,32 @@ enable all possible optimizations (bearing in mind that some "optimizations" may actually run more slowly in rare cases): #if defined(PNG_LIBPNG_VER) && (PNG_LIBPNG_VER >= 10200) - png_uint_32 tqmask, flags; + png_uint_32 mask, flags; flags = png_get_asm_flags(png_ptr); - tqmask = png_get_asm_flagtqmask(PNG_SELECT_READ | PNG_SELECT_WRITE); - png_set_asm_flags(png_ptr, flags | tqmask); + mask = png_get_asm_flagmask(PNG_SELECT_READ | PNG_SELECT_WRITE); + png_set_asm_flags(png_ptr, flags | mask); #endif To enable only optimizations relevant to reading PNGs, use PNG_SELECT_READ -by itself when calling png_get_asm_flagtqmask(); similarly for optimizing +by itself when calling png_get_asm_flagmask(); similarly for optimizing only writing. To disable all optimizations: #if defined(PNG_LIBPNG_VER) && (PNG_LIBPNG_VER >= 10200) flags = png_get_asm_flags(png_ptr); - tqmask = png_get_asm_flagtqmask(PNG_SELECT_READ | PNG_SELECT_WRITE); - png_set_asm_flags(png_ptr, flags & ~tqmask); + mask = png_get_asm_flagmask(PNG_SELECT_READ | PNG_SELECT_WRITE); + png_set_asm_flags(png_ptr, flags & ~mask); #endif -To enable or disable only MMX-related features, use png_get_mmx_flagtqmask() -in place of png_get_asm_flagtqmask(). The mmx version takes one additional +To enable or disable only MMX-related features, use png_get_mmx_flagmask() +in place of png_get_asm_flagmask(). The mmx version takes one additional parameter: #if defined(PNG_LIBPNG_VER) && (PNG_LIBPNG_VER >= 10200) int selection = PNG_SELECT_READ | PNG_SELECT_WRITE; int compilerID; - tqmask = png_get_mmx_flagtqmask(selection, &compilerID); + mask = png_get_mmx_flagmask(selection, &compilerID); #endif On return, compilerID will indicate which version of the MMX assembler @@ -3502,7 +3502,7 @@ Visual C++ (compilerID == 1) and GNU C (a.k.a. gcc/gas, compilerID == 2). On non-x86 platforms or on systems compiled without MMX optimizations, a value of -1 is used. -Note that both png_get_asm_flagtqmask() and png_get_mmx_flagtqmask() return +Note that both png_get_asm_flagmask() and png_get_mmx_flagmask() return all valid, settable optimization bits for the version of the library that's currently in use. In the case of shared (dynamically linked) libraries, this may include optimizations that did not exist at the time the code was @@ -3534,8 +3534,8 @@ the png_mmx_support() function: It returns -1 if MMX support is not compiled into libpng, 0 if MMX code is compiled but MMX is not supported by the processor, or 1 if MMX support -is fully available. Note that png_mmx_support(), png_get_mmx_flagtqmask(), -and png_get_asm_flagtqmask() all may be called without allocating and ini- +is fully available. Note that png_mmx_support(), png_get_mmx_flagmask(), +and png_get_asm_flagmask() all may be called without allocating and ini- tializing any PNG structures (for example, as part of a usage screen or "about" box). @@ -3572,14 +3572,14 @@ certain extensions to PNG for PNG images that are embedded in MNG datastreams. Libpng can support some of these extensions. To enable them, use the png_permit_mng_features() function: - feature_set = png_permit_mng_features(png_ptr, tqmask) - tqmask is a png_uint_32 containing the logical OR of the + feature_set = png_permit_mng_features(png_ptr, mask) + mask is a png_uint_32 containing the logical OR of the features you want to enable. These include PNG_FLAG_MNG_EMPTY_PLTE PNG_FLAG_MNG_FILTER_64 PNG_ALL_MNG_FEATURES feature_set is a png_32_uint that is the logical AND of - your tqmask with the set of MNG features that is + your mask with the set of MNG features that is supported by the version of libpng that you are using. It is an error to use this function when reading or writing a standalone diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/libpng.txt b/experimental/tqtinterface/qt4/src/3rdparty/libpng/libpng.txt index 60139c15e..689b56481 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/libpng.txt +++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/libpng.txt @@ -361,7 +361,7 @@ dithering, and setting filler.) If this is the case, simply do this: where png_transforms is an integer containing the logical OR of some set of transformation flags. This call is equivalent to png_read_info(), -followed the set of transformations indicated by the transform tqmask, +followed the set of transformations indicated by the transform mask, then png_read_image(), and finally png_read_end(). (The final parameter of this call is not yet used. Someday it might point @@ -535,12 +535,12 @@ into the info_ptr is returned for any complex types. png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, &trans_values); - trans - array of transtqparent entries for + trans - array of transparent entries for palette (PNG_INFO_tRNS) trans_values - graylevel or color sample values of - the single transtqparent color for + the single transparent color for non-paletted images (PNG_INFO_tRNS) - num_trans - number of transtqparent entries + num_trans - number of transparent entries (PNG_INFO_tRNS) png_get_hIST(png_ptr, info_ptr, &hist); @@ -773,7 +773,7 @@ is the level of opacity. If you need the alpha channel in an image to be the level of transparency instead of opacity, you can invert the alpha channel (or the tRNS chunk data) after it's read, so that 0 is fully opaque and 255 (in 8-bit or paletted images) or 65535 (in 16-bit -images) is fully transtqparent, with +images) is fully transparent, with png_set_invert_alpha(png_ptr); @@ -1212,8 +1212,8 @@ When you are done, you can free all memory allocated by libpng like this: It is also possible to individually free the info_ptr members that point to libpng-allocated storage with the following function: - png_free_data(png_ptr, info_ptr, tqmask, seq) - tqmask - identifies data to be freed, a tqmask + png_free_data(png_ptr, info_ptr, mask, seq) + mask - identifies data to be freed, a mask containing the logical OR of one or more of PNG_FREE_PLTE, PNG_FREE_TRNS, @@ -1231,7 +1231,7 @@ by the user and not by libpng, and will in those cases do nothing. The "seq" parameter is ignored if only one item of the selected data type, such as PLTE, is allowed. If "seq" is not -1, and multiple items are allowed for the data type identified in -the tqmask, such as text or sPLT, only the n'th item in the structure +the mask, such as text or sPLT, only the n'th item in the structure is freed, where n is "seq". The default behavior is only to free data that was allocated internally @@ -1239,8 +1239,8 @@ by libpng. This can be changed, so that libpng will not free the data, or so that it will free data that was allocated by the user with png_malloc() or png_zalloc() and passed in via a png_set_*() function, with - png_data_freer(png_ptr, info_ptr, freer, tqmask) - tqmask - which data elements are affected + png_data_freer(png_ptr, info_ptr, freer, mask) + mask - which data elements are affected same choices as in png_free_data() freer - one of PNG_DESTROY_WILL_FREE_DATA @@ -1274,8 +1274,8 @@ The png_free_data() function will turn off the "valid" flag for anything it frees. If you need to turn the flag off for a chunk that was freed by your application instead of by libpng, you can use - png_set_invalid(png_ptr, info_ptr, tqmask); - tqmask - identifies the chunks to be made invalid, + png_set_invalid(png_ptr, info_ptr, mask); + mask - identifies the chunks to be made invalid, containing the logical OR of one or more of PNG_INFO_gAMA, PNG_INFO_sBIT, @@ -1734,12 +1734,12 @@ Some of the more important parts of the png_info are: png_set_tRNS(png_ptr, info_ptr, trans, num_trans, trans_values); - trans - array of transtqparent entries for + trans - array of transparent entries for palette (PNG_INFO_tRNS) trans_values - graylevel or color sample values of - the single transtqparent color for + the single transparent color for non-paletted images (PNG_INFO_tRNS) - num_trans - number of transtqparent entries + num_trans - number of transparent entries (PNG_INFO_tRNS) png_set_hIST(png_ptr, info_ptr, hist); @@ -1955,7 +1955,7 @@ png_set_rows() to put image data in the info structure), simply do this: where png_transforms is an integer containing the logical OR of some set of transformation flags. This call is equivalent to png_write_info(), -followed the set of transformations indicated by the transform tqmask, +followed the set of transformations indicated by the transform mask, then png_write_image(), and finally png_write_end(). (The final parameter of this call is not yet used. Someday it might point @@ -1973,7 +1973,7 @@ Note that there is one transformation you may need to do before png_write_info(). In PNG files, the alpha channel in an image is the level of opacity. If your data is supplied as a level of transparency, you can invert the alpha channel before you write it, so -that 0 is fully transtqparent and 255 (in 8-bit or paletted images) or +that 0 is fully transparent and 255 (in 8-bit or paletted images) or 65535 (in 16-bit images) is fully opaque, with png_set_invert_alpha(png_ptr); @@ -1982,7 +1982,7 @@ This must appear before png_write_info() instead of later with the other transformations because in the case of paletted images the tRNS chunk data has to be inverted before the tRNS chunk is written. If your image is not a paletted image, the tRNS data (which in such cases -represents a single color to be rendered as transtqparent) won't need to +represents a single color to be rendered as transparent) won't need to be changed, and you can safely do this transformation after your png_write_info() call. @@ -2208,8 +2208,8 @@ When you are done, you can free all memory used by libpng like this: It is also possible to individually free the info_ptr members that point to libpng-allocated storage with the following function: - png_free_data(png_ptr, info_ptr, tqmask, seq) - tqmask - identifies data to be freed, a tqmask + png_free_data(png_ptr, info_ptr, mask, seq) + mask - identifies data to be freed, a mask containing the logical OR of one or more of PNG_FREE_PLTE, PNG_FREE_TRNS, @@ -2227,7 +2227,7 @@ by the user and not by libpng, and will in those cases do nothing. The "seq" parameter is ignored if only one item of the selected data type, such as PLTE, is allowed. If "seq" is not -1, and multiple items are allowed for the data type identified in -the tqmask, such as text or sPLT, only the n'th item in the structure +the mask, such as text or sPLT, only the n'th item in the structure is freed, where n is "seq". If you allocated data such as a palette that you passed @@ -2239,8 +2239,8 @@ by libpng. This can be changed, so that libpng will not free the data, or so that it will free data that was allocated by the user with png_malloc() or png_zalloc() and passed in via a png_set_*() function, with - png_data_freer(png_ptr, info_ptr, freer, tqmask) - tqmask - which data elements are affected + png_data_freer(png_ptr, info_ptr, freer, mask) + mask - which data elements are affected same choices as in png_free_data() freer - one of PNG_DESTROY_WILL_FREE_DATA @@ -2660,7 +2660,7 @@ A new feature in libpng 1.2.0 is the ability to dynamically switch between standard and optimized versions of some routines. Currently these are limited to three computationally intensive tasks when reading PNG files: decoding row filters, expanding interlacing, and combining interlaced or -transtqparent row data with previous row data. Currently the optimized +transparent row data with previous row data. Currently the optimized versions are available only for x86 (Intel, AMD, etc.) platforms with MMX support, though this may change in future versions. (For example, the non-MMX assembler optimizations for zlib might become similarly @@ -2677,32 +2677,32 @@ enable all possible optimizations (bearing in mind that some "optimizations" may actually run more slowly in rare cases): #if defined(PNG_LIBPNG_VER) && (PNG_LIBPNG_VER >= 10200) - png_uint_32 tqmask, flags; + png_uint_32 mask, flags; flags = png_get_asm_flags(png_ptr); - tqmask = png_get_asm_flagtqmask(PNG_SELECT_READ | PNG_SELECT_WRITE); - png_set_asm_flags(png_ptr, flags | tqmask); + mask = png_get_asm_flagmask(PNG_SELECT_READ | PNG_SELECT_WRITE); + png_set_asm_flags(png_ptr, flags | mask); #endif To enable only optimizations relevant to reading PNGs, use PNG_SELECT_READ -by itself when calling png_get_asm_flagtqmask(); similarly for optimizing +by itself when calling png_get_asm_flagmask(); similarly for optimizing only writing. To disable all optimizations: #if defined(PNG_LIBPNG_VER) && (PNG_LIBPNG_VER >= 10200) flags = png_get_asm_flags(png_ptr); - tqmask = png_get_asm_flagtqmask(PNG_SELECT_READ | PNG_SELECT_WRITE); - png_set_asm_flags(png_ptr, flags & ~tqmask); + mask = png_get_asm_flagmask(PNG_SELECT_READ | PNG_SELECT_WRITE); + png_set_asm_flags(png_ptr, flags & ~mask); #endif -To enable or disable only MMX-related features, use png_get_mmx_flagtqmask() -in place of png_get_asm_flagtqmask(). The mmx version takes one additional +To enable or disable only MMX-related features, use png_get_mmx_flagmask() +in place of png_get_asm_flagmask(). The mmx version takes one additional parameter: #if defined(PNG_LIBPNG_VER) && (PNG_LIBPNG_VER >= 10200) int selection = PNG_SELECT_READ | PNG_SELECT_WRITE; int compilerID; - tqmask = png_get_mmx_flagtqmask(selection, &compilerID); + mask = png_get_mmx_flagmask(selection, &compilerID); #endif On return, compilerID will indicate which version of the MMX assembler @@ -2711,7 +2711,7 @@ Visual C++ (compilerID == 1) and GNU C (a.k.a. gcc/gas, compilerID == 2). On non-x86 platforms or on systems compiled without MMX optimizations, a value of -1 is used. -Note that both png_get_asm_flagtqmask() and png_get_mmx_flagtqmask() return +Note that both png_get_asm_flagmask() and png_get_mmx_flagmask() return all valid, settable optimization bits for the version of the library that's currently in use. In the case of shared (dynamically linked) libraries, this may include optimizations that did not exist at the time the code was @@ -2743,8 +2743,8 @@ the png_mmx_support() function: It returns -1 if MMX support is not compiled into libpng, 0 if MMX code is compiled but MMX is not supported by the processor, or 1 if MMX support -is fully available. Note that png_mmx_support(), png_get_mmx_flagtqmask(), -and png_get_asm_flagtqmask() all may be called without allocating and ini- +is fully available. Note that png_mmx_support(), png_get_mmx_flagmask(), +and png_get_asm_flagmask() all may be called without allocating and ini- tializing any PNG structures (for example, as part of a usage screen or "about" box). @@ -2781,14 +2781,14 @@ certain extensions to PNG for PNG images that are embedded in MNG datastreams. Libpng can support some of these extensions. To enable them, use the png_permit_mng_features() function: - feature_set = png_permit_mng_features(png_ptr, tqmask) - tqmask is a png_uint_32 containing the logical OR of the + feature_set = png_permit_mng_features(png_ptr, mask) + mask is a png_uint_32 containing the logical OR of the features you want to enable. These include PNG_FLAG_MNG_EMPTY_PLTE PNG_FLAG_MNG_FILTER_64 PNG_ALL_MNG_FEATURES feature_set is a png_32_uint that is the logical AND of - your tqmask with the set of MNG features that is + your mask with the set of MNG features that is supported by the version of libpng that you are using. It is an error to use this function when reading or writing a standalone diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/libpngpf.3 b/experimental/tqtinterface/qt4/src/3rdparty/libpng/libpngpf.3 index a75a66902..3c1f37971 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/libpngpf.3 +++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/libpngpf.3 @@ -27,7 +27,7 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.2.5 \fI\fB -\fBvoid png_combine_row (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIrow\fP\fB, int \fItqmask\fP\fB);\fP +\fBvoid png_combine_row (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIrow\fP\fB, int \fImask\fP\fB);\fP \fI\fB 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 } diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/png.h b/experimental/tqtinterface/qt4/src/3rdparty/libpng/png.h index 76fef59c9..a7e1a4a8b 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/png.h +++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/png.h @@ -600,7 +600,7 @@ typedef struct png_info_struct png_uint_32 rowbytes; /* bytes needed to hold an untransformed row */ png_colorp palette; /* array of color values (valid & PNG_INFO_PLTE) */ png_uint_16 num_palette; /* number of color entries in "palette" (PLTE) */ - png_uint_16 num_trans; /* number of transtqparent palette color (tRNS) */ + png_uint_16 num_trans; /* number of transparent palette color (tRNS) */ png_byte bit_depth; /* 1, 2, 4, 8, or 16 bits/channel (from IHDR) */ png_byte color_type; /* see PNG_COLOR_TYPE_ below (from IHDR) */ /* The following three should have been named *_method not *_type */ @@ -671,13 +671,13 @@ defined(PNG_READ_BACKGROUND_SUPPORTED) * other image types that don't need a full alpha channel. There are * "num_trans" transparency values for a paletted image, stored in the * same order as the palette colors, starting from index 0. Values - * for the data are in the range [0, 255], ranging from fully transtqparent + * for the data are in the range [0, 255], ranging from fully transparent * to fully opaque, respectively. For non-paletted images, there is a - * single color specified that should be treated as fully transtqparent. + * single color specified that should be treated as fully transparent. * Data is valid if (valid & PNG_INFO_tRNS) is non-zero. */ - png_bytep trans; /* transtqparent values for paletted image */ - png_color_16 trans_values; /* transtqparent color for non-palette image */ + png_bytep trans; /* transparent values for paletted image */ + png_color_16 trans_values; /* transparent color for non-palette image */ #endif #if defined(PNG_bKGD_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED) @@ -1867,7 +1867,7 @@ extern PNG_EXPORT(void,png_free_data) PNGARG((png_structp png_ptr, /* Reassign responsibility for freeing existing data, whether allocated * by libpng or by the application */ extern PNG_EXPORT(void,png_data_freer) PNGARG((png_structp png_ptr, - png_infop info_ptr, int freer, png_uint_32 tqmask)); + png_infop info_ptr, int freer, png_uint_32 mask)); #endif /* assignments for png_data_freer */ #define PNG_DESTROY_WILL_FREE_DATA 1 @@ -2276,7 +2276,7 @@ PNG_EXPORT(int,png_handle_as_unknown) PNGARG((png_structp png_ptr, png_bytep If you need to turn it off for a chunk that your application has freed, you can use png_set_invalid(png_ptr, info_ptr, PNG_INFO_CHNK); */ extern PNG_EXPORT(void, png_set_invalid) PNGARG((png_structp png_ptr, - png_infop info_ptr, int tqmask)); + png_infop info_ptr, int mask)); #if defined(PNG_INFO_IMAGE_SUPPORTED) /* The "params" pointer is currently not used and is for future expansion. */ @@ -2384,11 +2384,11 @@ extern PNG_EXPORT(png_uint_32,png_permit_mng_features) PNGARG((png_structp #if !defined(PNG_1_0_X) /* pngget.c */ -extern PNG_EXPORT(png_uint_32,png_get_mmx_flagtqmask) +extern PNG_EXPORT(png_uint_32,png_get_mmx_flagmask) PNGARG((int flag_select, int *compilerID)); /* pngget.c */ -extern PNG_EXPORT(png_uint_32,png_get_asm_flagtqmask) +extern PNG_EXPORT(png_uint_32,png_get_asm_flagmask) PNGARG((int flag_select)); /* pngget.c */ @@ -2950,7 +2950,7 @@ PNG_EXTERN void png_build_gamma_table PNGARG((png_structp png_ptr)); /* combine a row of data, dealing with alpha, etc. if requested */ PNG_EXTERN void png_combine_row PNGARG((png_structp png_ptr, png_bytep row, - int tqmask)); + int mask)); #if defined(PNG_READ_INTERLACING_SUPPORTED) /* expand an interlaced row */ diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/pnggccrd.c b/experimental/tqtinterface/qt4/src/3rdparty/libpng/pnggccrd.c index 105625109..88a1da23c 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/pnggccrd.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/pnggccrd.c @@ -109,7 +109,7 @@ * listings... Apparently register spillage has to do with ebx, since * it's used to index the global offset table. Commenting it out of the * input-reg lists in png_combine_row() eliminated compiler barfage, so - * ifdef'd with __PIC__ macro: if defined, use a global for untqmask + * ifdef'd with __PIC__ macro: if defined, use a global for unmask * * 19991107: * - verified CPUID clobberage: 12-char string constant ("GenuineIntel", @@ -146,7 +146,7 @@ * pnggccrd.c:994: more than 10 operands in `asm' * pnggccrd.c:1177: more than 10 operands in `asm' * They are all the same problem and can be worked around by using the - * global _untqmask variable unconditionally, not just in the -fPIC case. + * global _unmask variable unconditionally, not just in the -fPIC case. * Reportedly earlier versions of gcc also have the problem with more than * 10 operands; they just don't report it. Much strangeness ensues, etc. * @@ -257,22 +257,22 @@ static const int FARDATA png_pass_width[7] = {8, 4, 4, 2, 2, 1, 1}; # define _mmx_supported mmx_supported # define _const4 const4 # define _const6 const6 -# define _mask8_0 tqmask8_0 -# define _mask16_1 tqmask16_1 -# define _mask16_0 tqmask16_0 -# define _mask24_2 tqmask24_2 -# define _mask24_1 tqmask24_1 -# define _mask24_0 tqmask24_0 -# define _mask32_3 tqmask32_3 -# define _mask32_2 tqmask32_2 -# define _mask32_1 tqmask32_1 -# define _mask32_0 tqmask32_0 -# define _mask48_5 tqmask48_5 -# define _mask48_4 tqmask48_4 -# define _mask48_3 tqmask48_3 -# define _mask48_2 tqmask48_2 -# define _mask48_1 tqmask48_1 -# define _mask48_0 tqmask48_0 +# define _mask8_0 mask8_0 +# define _mask16_1 mask16_1 +# define _mask16_0 mask16_0 +# define _mask24_2 mask24_2 +# define _mask24_1 mask24_1 +# define _mask24_0 mask24_0 +# define _mask32_3 mask32_3 +# define _mask32_2 mask32_2 +# define _mask32_1 mask32_1 +# define _mask32_0 mask32_0 +# define _mask48_5 mask48_5 +# define _mask48_4 mask48_4 +# define _mask48_3 mask48_3 +# define _mask48_2 mask48_2 +# define _mask48_1 mask48_1 +# define _mask48_0 mask48_0 # define _LBCarryMask LBCarryMask # define _HBClearMask HBClearMask # define _ActiveMask ActiveMask @@ -281,7 +281,7 @@ static const int FARDATA png_pass_width[7] = {8, 4, 4, 2, 2, 1, 1}; # define _ShiftBpp ShiftBpp # define _ShiftRem ShiftRem #ifdef PNG_THREAD_UNSAFE_OK -# define _untqmask untqmask +# define _unmask unmask # define _FullLength FullLength # define _MMXLength MMXLength # define _dif dif @@ -295,14 +295,14 @@ static const int FARDATA png_pass_width[7] = {8, 4, 4, 2, 2, 1, 1}; /* These constants are used in the inlined MMX assembly code. Ignore gcc's "At top level: defined but not used" warnings. */ -/* GRR 20000706: originally _untqmask was needed only when compiling with -fPIC, +/* GRR 20000706: originally _unmask was needed only when compiling with -fPIC, * since that case uses the %ebx register for indexing the Global Offset Table * and there were no other registers available. But gcc 2.95 and later emit - * "more than 10 operands in `asm'" errors when %ebx is used to preload untqmask + * "more than 10 operands in `asm'" errors when %ebx is used to preload unmask * in the non-PIC case, so we'll just use the global unconditionally now. */ #ifdef PNG_THREAD_UNSAFE_OK -static int _untqmask; +static int _unmask; #endif static unsigned long long _mask8_0 = 0x0102040810204080LL; @@ -394,19 +394,19 @@ static int _mmx_supported = 2; /* Combines the row recently read in with the previous 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. */ + If you want all pixels to be combined, pass 0xff (255) in mask. */ /* Use this routine for the x86 platform - it uses a faster MMX routine if the machine supports MMX. */ 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 (pnggccrd.c)\n"); @@ -418,13 +418,13 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) } #endif - if (tqmask == 0xff) + if (mask == 0xff) { - png_debug(2,"tqmask == 0xff: doing single png_memcpy()\n"); + png_debug(2,"mask == 0xff: doing single png_memcpy()\n"); png_memcpy(row, png_ptr->row_buf + 1, (png_size_t)((png_ptr->width * png_ptr->row_info.pixel_depth + 7) >> 3)); } - else /* (png_combine_row() is never called with tqmask == 0) */ + else /* (png_combine_row() is never called with mask == 0) */ { switch (png_ptr->row_info.pixel_depth) { @@ -459,7 +459,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) for (i = 0; i < png_ptr->width; i++) { - if (m & tqmask) + if (m & mask) { int value; @@ -517,7 +517,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) for (i = 0; i < png_ptr->width; i++) { - if (m & tqmask) + if (m & mask) { value = (*sp >> shift) & 0x3; *dp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff); @@ -571,7 +571,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) for (i = 0; i < png_ptr->width; i++) { - if (m & tqmask) + if (m & mask) { value = (*sp >> shift) & 0xf; *dp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff); @@ -614,14 +614,14 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) int dummy_value_c; int dummy_value_S; int dummy_value_D; - _untqmask = ~tqmask; // global variable for -fPIC version + _unmask = ~mask; // global variable for -fPIC version srcptr = png_ptr->row_buf + 1; dstptr = row; len = png_ptr->width &~7; // reduce to multiple of 8 diff = (int) (png_ptr->width & 7); // amount lost __asm__ __volatile__ ( - "movd _untqmask, %%mm7 \n\t" // load bit pattern + "movd _unmask, %%mm7 \n\t" // load bit pattern "psubb %%mm6, %%mm6 \n\t" // zero mm6 "punpcklbw %%mm7, %%mm7 \n\t" "punpcklwd %%mm7, %%mm7 \n\t" @@ -655,7 +655,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) "movl %%eax, %%ecx \n\t" "cmpl $0, %%ecx \n\t" "jz end8 \n\t" -// preload "movl tqmask, %%edx \n\t" +// preload "movl mask, %%edx \n\t" "sall $24, %%edx \n\t" // make low byte, high byte "secondloop8: \n\t" @@ -682,9 +682,9 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) : "3" (srcptr), // esi // input regs "4" (dstptr), // edi "0" (diff), // eax -// was (untqmask) "b" RESERVED // ebx // Global Offset Table idx +// was (unmask) "b" RESERVED // ebx // Global Offset Table idx "2" (len), // ecx - "1" (tqmask) // edx + "1" (mask) // edx #if 0 /* MMX regs (%mm0, etc.) not supported by gcc 2.7.2.3 or egcs 1.1 */ : "%mm0", "%mm4", "%mm6", "%mm7" // clobber list @@ -752,14 +752,14 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) int dummy_value_c; int dummy_value_S; int dummy_value_D; - _untqmask = ~tqmask; // global variable for -fPIC version + _unmask = ~mask; // global variable for -fPIC version srcptr = png_ptr->row_buf + 1; dstptr = row; len = png_ptr->width &~7; // reduce to multiple of 8 diff = (int) (png_ptr->width & 7); // amount lost // __asm__ __volatile__ ( - "movd _untqmask, %%mm7 \n\t" // load bit pattern + "movd _unmask, %%mm7 \n\t" // load bit pattern "psubb %%mm6, %%mm6 \n\t" // zero mm6 "punpcklbw %%mm7, %%mm7 \n\t" "punpcklwd %%mm7, %%mm7 \n\t" @@ -808,7 +808,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) "movl %%eax, %%ecx \n\t" "cmpl $0, %%ecx \n\t" "jz end16 \n\t" -// preload "movl tqmask, %%edx \n\t" +// preload "movl mask, %%edx \n\t" "sall $24, %%edx \n\t" // make low byte, high byte "secondloop16: \n\t" @@ -833,9 +833,9 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) "=D" (dummy_value_D) : "0" (diff), // eax // input regs -// was (untqmask) " " RESERVED // ebx // Global Offset Table idx +// was (unmask) " " RESERVED // ebx // Global Offset Table idx "1" (len), // ecx - "2" (tqmask), // edx + "2" (mask), // edx "3" (srcptr), // esi "4" (dstptr) // edi @@ -905,14 +905,14 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) int dummy_value_c; int dummy_value_S; int dummy_value_D; - _untqmask = ~tqmask; // global variable for -fPIC version + _unmask = ~mask; // global variable for -fPIC version srcptr = png_ptr->row_buf + 1; dstptr = row; len = png_ptr->width &~7; // reduce to multiple of 8 diff = (int) (png_ptr->width & 7); // amount lost // __asm__ __volatile__ ( - "movd _untqmask, %%mm7 \n\t" // load bit pattern + "movd _unmask, %%mm7 \n\t" // load bit pattern "psubb %%mm6, %%mm6 \n\t" // zero mm6 "punpcklbw %%mm7, %%mm7 \n\t" "punpcklwd %%mm7, %%mm7 \n\t" @@ -973,7 +973,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) "movl %%eax, %%ecx \n\t" "cmpl $0, %%ecx \n\t" "jz end24 \n\t" -// preload "movl tqmask, %%edx \n\t" +// preload "movl mask, %%edx \n\t" "sall $24, %%edx \n\t" // make low byte, high byte "secondloop24: \n\t" @@ -1003,9 +1003,9 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) : "3" (srcptr), // esi // input regs "4" (dstptr), // edi "0" (diff), // eax -// was (untqmask) "b" RESERVED // ebx // Global Offset Table idx +// was (unmask) "b" RESERVED // ebx // Global Offset Table idx "2" (len), // ecx - "1" (tqmask) // edx + "1" (mask) // edx #if 0 /* MMX regs (%mm0, etc.) not supported by gcc 2.7.2.3 or egcs 1.1 */ : "%mm0", "%mm1", "%mm2" // clobber list @@ -1073,14 +1073,14 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) int dummy_value_c; int dummy_value_S; int dummy_value_D; - _untqmask = ~tqmask; // global variable for -fPIC version + _unmask = ~mask; // global variable for -fPIC version srcptr = png_ptr->row_buf + 1; dstptr = row; len = png_ptr->width &~7; // reduce to multiple of 8 diff = (int) (png_ptr->width & 7); // amount lost // __asm__ __volatile__ ( - "movd _untqmask, %%mm7 \n\t" // load bit pattern + "movd _unmask, %%mm7 \n\t" // load bit pattern "psubb %%mm6, %%mm6 \n\t" // zero mm6 "punpcklbw %%mm7, %%mm7 \n\t" "punpcklwd %%mm7, %%mm7 \n\t" @@ -1151,7 +1151,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) "movl %%eax, %%ecx \n\t" "cmpl $0, %%ecx \n\t" "jz end32 \n\t" -// preload "movl tqmask, %%edx \n\t" +// preload "movl mask, %%edx \n\t" "sall $24, %%edx \n\t" // low byte => high byte "secondloop32: \n\t" @@ -1178,9 +1178,9 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) : "3" (srcptr), // esi // input regs "4" (dstptr), // edi "0" (diff), // eax -// was (untqmask) "b" RESERVED // ebx // Global Offset Table idx +// was (unmask) "b" RESERVED // ebx // Global Offset Table idx "2" (len), // ecx - "1" (tqmask) // edx + "1" (mask) // edx #if 0 /* MMX regs (%mm0, etc.) not supported by gcc 2.7.2.3 or egcs 1.1 */ : "%mm0", "%mm1", "%mm2", "%mm3" // clobber list @@ -1248,14 +1248,14 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) int dummy_value_c; int dummy_value_S; int dummy_value_D; - _untqmask = ~tqmask; // global variable for -fPIC version + _unmask = ~mask; // global variable for -fPIC version srcptr = png_ptr->row_buf + 1; dstptr = row; len = png_ptr->width &~7; // reduce to multiple of 8 diff = (int) (png_ptr->width & 7); // amount lost // __asm__ __volatile__ ( - "movd _untqmask, %%mm7 \n\t" // load bit pattern + "movd _unmask, %%mm7 \n\t" // load bit pattern "psubb %%mm6, %%mm6 \n\t" // zero mm6 "punpcklbw %%mm7, %%mm7 \n\t" "punpcklwd %%mm7, %%mm7 \n\t" @@ -1343,7 +1343,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) "movl %%eax, %%ecx \n\t" "cmpl $0, %%ecx \n\t" "jz end48 \n\t" -// preload "movl tqmask, %%edx \n\t" +// preload "movl mask, %%edx \n\t" "sall $24, %%edx \n\t" // make low byte, high byte "secondloop48: \n\t" @@ -1370,9 +1370,9 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) : "3" (srcptr), // esi // input regs "4" (dstptr), // edi "0" (diff), // eax -// was (untqmask) "b" RESERVED // ebx // Global Offset Table idx +// was (unmask) "b" RESERVED // ebx // Global Offset Table idx "2" (len), // ecx - "1" (tqmask) // edx + "1" (mask) // edx #if 0 /* MMX regs (%mm0, etc.) not supported by gcc 2.7.2.3 or egcs 1.1 */ : "%mm0", "%mm1", "%mm2", "%mm3" // clobber list @@ -1468,7 +1468,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) } } /* end switch (png_ptr->row_info.pixel_depth) */ - } /* end if (non-trivial tqmask) */ + } /* end if (non-trivial mask) */ } /* end png_combine_row() */ @@ -2802,7 +2802,7 @@ png_read_filter_row_mmx_avg(png_row_infop row_info, png_bytep row, "movl %%edi, _dif \n\t" // take start of row "addl %%ebx, _dif \n\t" // add bpp "addl $0xf, _dif \n\t" // add 7+8 to incr past tqalignment bdry - "andl $0xfffffff8, _dif \n\t" // tqmask to tqalignment boundary + "andl $0xfffffff8, _dif \n\t" // mask to tqalignment boundary "subl %%edi, _dif \n\t" // subtract from start => value ebx at "jz avg_go \n\t" // tqalignment @@ -2901,7 +2901,7 @@ png_read_filter_row_mmx_avg(png_row_infop row_info, png_bytep row, // Avg for each Active // byte // add 2nd active group (Raw(x-bpp)/2) to average with _LBCarry - "psllq _ShiftBpp, %%mm6 \n\t" // shift the mm6 tqmask to cover + "psllq _ShiftBpp, %%mm6 \n\t" // shift the mm6 mask to cover // bytes 3-5 "movq %%mm0, %%mm2 \n\t" // mov updated Raws to mm2 "psllq _ShiftBpp, %%mm2 \n\t" // shift data to pos. correctly @@ -2922,7 +2922,7 @@ png_read_filter_row_mmx_avg(png_row_infop row_info, png_bytep row, // byte // add 3rd active group (Raw(x-bpp)/2) to average with _LBCarry - "psllq _ShiftBpp, %%mm6 \n\t" // shift mm6 tqmask to cover last + "psllq _ShiftBpp, %%mm6 \n\t" // shift mm6 mask to cover last // two // bytes "movq %%mm0, %%mm2 \n\t" // mov updated Raws to mm2 @@ -2991,7 +2991,7 @@ png_read_filter_row_mmx_avg(png_row_infop row_info, png_bytep row, // preload "movl prev_row, %%esi \n\t" // esi: Prior(x) "movq %%mm7, %%mm6 \n\t" "movq _LBCarryMask, %%mm5 \n\t" - "psllq _ShiftBpp, %%mm6 \n\t" // create tqmask for 2nd active + "psllq _ShiftBpp, %%mm6 \n\t" // create mask for 2nd active // group // prime the pump: load the first Raw(x-bpp) data set @@ -3118,7 +3118,7 @@ png_read_filter_row_mmx_avg(png_row_infop row_info, png_bytep row, // for each Active byte // add 2nd active group (Raw(x-bpp)/2) to average with _LBCarry - "psllq _ShiftBpp, %%mm6 \n\t" // shift the mm6 tqmask to cover + "psllq _ShiftBpp, %%mm6 \n\t" // shift the mm6 mask to cover // bytes 2 & 3 "movq %%mm0, %%mm2 \n\t" // mov updated Raws to mm2 "psllq _ShiftBpp, %%mm2 \n\t" // shift data to pos. correctly @@ -3139,7 +3139,7 @@ png_read_filter_row_mmx_avg(png_row_infop row_info, png_bytep row, // Avg for each Active byte // add 3rd active group (Raw(x-bpp)/2) to average with _LBCarry - "psllq _ShiftBpp, %%mm6 \n\t" // shift the mm6 tqmask to cover + "psllq _ShiftBpp, %%mm6 \n\t" // shift the mm6 mask to cover // bytes 4 & 5 "movq %%mm0, %%mm2 \n\t" // mov updated Raws to mm2 "psllq _ShiftBpp, %%mm2 \n\t" // shift data to pos. correctly @@ -3159,7 +3159,7 @@ png_read_filter_row_mmx_avg(png_row_infop row_info, png_bytep row, // Avg for each Active byte // add 4th active group (Raw(x-bpp)/2) to average with _LBCarry - "psllq _ShiftBpp, %%mm6 \n\t" // shift the mm6 tqmask to cover + "psllq _ShiftBpp, %%mm6 \n\t" // shift the mm6 mask to cover // bytes 6 & 7 "movq %%mm0, %%mm2 \n\t" // mov updated Raws to mm2 "psllq _ShiftBpp, %%mm2 \n\t" // shift data to pos. correctly @@ -3467,7 +3467,7 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, "xorl %%ecx, %%ecx \n\t" "addl $0xf, _dif \n\t" // add 7 + 8 to incr past tqalignment // boundary - "andl $0xfffffff8, _dif \n\t" // tqmask to tqalignment boundary + "andl $0xfffffff8, _dif \n\t" // mask to tqalignment boundary "subl %%edi, _dif \n\t" // subtract from start ==> value ebx // at tqalignment "jz paeth_go \n\t" @@ -3609,16 +3609,16 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, // pa = abs(p-a) = abs(pav) // pb = abs(p-b) = abs(pbv) // pc = abs(p-c) = abs(pcv) - "pcmpgtw %%mm4, %%mm0 \n\t" // create tqmask pav bytes < 0 + "pcmpgtw %%mm4, %%mm0 \n\t" // create mask pav bytes < 0 "paddw %%mm5, %%mm6 \n\t" "pand %%mm4, %%mm0 \n\t" // only pav bytes < 0 in mm7 - "pcmpgtw %%mm5, %%mm7 \n\t" // create tqmask pbv bytes < 0 + "pcmpgtw %%mm5, %%mm7 \n\t" // create mask pbv bytes < 0 "psubw %%mm0, %%mm4 \n\t" "pand %%mm5, %%mm7 \n\t" // only pbv bytes < 0 in mm0 "psubw %%mm0, %%mm4 \n\t" "psubw %%mm7, %%mm5 \n\t" "pxor %%mm0, %%mm0 \n\t" - "pcmpgtw %%mm6, %%mm0 \n\t" // create tqmask pcv bytes < 0 + "pcmpgtw %%mm6, %%mm0 \n\t" // create mask pcv bytes < 0 "pand %%mm6, %%mm0 \n\t" // only pav bytes < 0 in mm7 "psubw %%mm7, %%mm5 \n\t" "psubw %%mm0, %%mm6 \n\t" @@ -3627,9 +3627,9 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, "psubw %%mm0, %%mm6 \n\t" "pcmpgtw %%mm5, %%mm7 \n\t" // pa > pb? "movq %%mm7, %%mm0 \n\t" - // use mm7 tqmask to merge pa & pb + // use mm7 mask to merge pa & pb "pand %%mm7, %%mm5 \n\t" - // use mm0 tqmask copy to merge a & b + // use mm0 mask copy to merge a & b "pand %%mm0, %%mm2 \n\t" "pandn %%mm4, %%mm7 \n\t" "pandn %%mm1, %%mm0 \n\t" @@ -3670,8 +3670,8 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, // pa = abs(p-a) = abs(pav) // pb = abs(p-b) = abs(pbv) // pc = abs(p-c) = abs(pcv) - "pcmpgtw %%mm5, %%mm0 \n\t" // create tqmask pbv bytes < 0 - "pcmpgtw %%mm4, %%mm7 \n\t" // create tqmask pav bytes < 0 + "pcmpgtw %%mm5, %%mm0 \n\t" // create mask pbv bytes < 0 + "pcmpgtw %%mm4, %%mm7 \n\t" // create mask pav bytes < 0 "pand %%mm5, %%mm0 \n\t" // only pbv bytes < 0 in mm0 "pand %%mm4, %%mm7 \n\t" // only pav bytes < 0 in mm7 "psubw %%mm0, %%mm5 \n\t" @@ -3679,7 +3679,7 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, "psubw %%mm0, %%mm5 \n\t" "psubw %%mm7, %%mm4 \n\t" "pxor %%mm0, %%mm0 \n\t" - "pcmpgtw %%mm6, %%mm0 \n\t" // create tqmask pcv bytes < 0 + "pcmpgtw %%mm6, %%mm0 \n\t" // create mask pcv bytes < 0 "pand %%mm6, %%mm0 \n\t" // only pav bytes < 0 in mm7 "psubw %%mm0, %%mm6 \n\t" // test pa <= pb @@ -3687,9 +3687,9 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, "psubw %%mm0, %%mm6 \n\t" "pcmpgtw %%mm5, %%mm7 \n\t" // pa > pb? "movq %%mm7, %%mm0 \n\t" - // use mm7 tqmask to merge pa & pb + // use mm7 mask to merge pa & pb "pand %%mm7, %%mm5 \n\t" - // use mm0 tqmask copy to merge a & b + // use mm0 mask copy to merge a & b "pand %%mm0, %%mm2 \n\t" "pandn %%mm4, %%mm7 \n\t" "pandn %%mm1, %%mm0 \n\t" @@ -3733,8 +3733,8 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, // pa = abs(p-a) = abs(pav) // pb = abs(p-b) = abs(pbv) // pc = abs(p-c) = abs(pcv) - "pcmpgtw %%mm4, %%mm0 \n\t" // create tqmask pav bytes < 0 - "pcmpgtw %%mm5, %%mm7 \n\t" // create tqmask pbv bytes < 0 + "pcmpgtw %%mm4, %%mm0 \n\t" // create mask pav bytes < 0 + "pcmpgtw %%mm5, %%mm7 \n\t" // create mask pbv bytes < 0 "pand %%mm4, %%mm0 \n\t" // only pav bytes < 0 in mm7 "pand %%mm5, %%mm7 \n\t" // only pbv bytes < 0 in mm0 "psubw %%mm0, %%mm4 \n\t" @@ -3742,7 +3742,7 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, "psubw %%mm0, %%mm4 \n\t" "psubw %%mm7, %%mm5 \n\t" "pxor %%mm0, %%mm0 \n\t" - "pcmpgtw %%mm6, %%mm0 \n\t" // create tqmask pcv bytes < 0 + "pcmpgtw %%mm6, %%mm0 \n\t" // create mask pcv bytes < 0 "pand %%mm6, %%mm0 \n\t" // only pav bytes < 0 in mm7 "psubw %%mm0, %%mm6 \n\t" // test pa <= pb @@ -3750,9 +3750,9 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, "psubw %%mm0, %%mm6 \n\t" "pcmpgtw %%mm5, %%mm7 \n\t" // pa > pb? "movq %%mm7, %%mm0 \n\t" - // use mm0 tqmask copy to merge a & b + // use mm0 mask copy to merge a & b "pand %%mm0, %%mm2 \n\t" - // use mm7 tqmask to merge pa & pb + // use mm7 mask to merge pa & pb "pand %%mm7, %%mm5 \n\t" "pandn %%mm1, %%mm0 \n\t" "pandn %%mm4, %%mm7 \n\t" @@ -3833,16 +3833,16 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, // pa = abs(p-a) = abs(pav) // pb = abs(p-b) = abs(pbv) // pc = abs(p-c) = abs(pcv) - "pcmpgtw %%mm4, %%mm0 \n\t" // create tqmask pav bytes < 0 + "pcmpgtw %%mm4, %%mm0 \n\t" // create mask pav bytes < 0 "paddw %%mm5, %%mm6 \n\t" "pand %%mm4, %%mm0 \n\t" // only pav bytes < 0 in mm7 - "pcmpgtw %%mm5, %%mm7 \n\t" // create tqmask pbv bytes < 0 + "pcmpgtw %%mm5, %%mm7 \n\t" // create mask pbv bytes < 0 "psubw %%mm0, %%mm4 \n\t" "pand %%mm5, %%mm7 \n\t" // only pbv bytes < 0 in mm0 "psubw %%mm0, %%mm4 \n\t" "psubw %%mm7, %%mm5 \n\t" "pxor %%mm0, %%mm0 \n\t" - "pcmpgtw %%mm6, %%mm0 \n\t" // create tqmask pcv bytes < 0 + "pcmpgtw %%mm6, %%mm0 \n\t" // create mask pcv bytes < 0 "pand %%mm6, %%mm0 \n\t" // only pav bytes < 0 in mm7 "psubw %%mm7, %%mm5 \n\t" "psubw %%mm0, %%mm6 \n\t" @@ -3851,9 +3851,9 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, "psubw %%mm0, %%mm6 \n\t" "pcmpgtw %%mm5, %%mm7 \n\t" // pa > pb? "movq %%mm7, %%mm0 \n\t" - // use mm7 tqmask to merge pa & pb + // use mm7 mask to merge pa & pb "pand %%mm7, %%mm5 \n\t" - // use mm0 tqmask copy to merge a & b + // use mm0 mask copy to merge a & b "pand %%mm0, %%mm2 \n\t" "pandn %%mm4, %%mm7 \n\t" "pandn %%mm1, %%mm0 \n\t" @@ -3897,16 +3897,16 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, // pa = abs(p-a) = abs(pav) // pb = abs(p-b) = abs(pbv) // pc = abs(p-c) = abs(pcv) - "pcmpgtw %%mm4, %%mm0 \n\t" // create tqmask pav bytes < 0 + "pcmpgtw %%mm4, %%mm0 \n\t" // create mask pav bytes < 0 "paddw %%mm5, %%mm6 \n\t" "pand %%mm4, %%mm0 \n\t" // only pav bytes < 0 in mm7 - "pcmpgtw %%mm5, %%mm7 \n\t" // create tqmask pbv bytes < 0 + "pcmpgtw %%mm5, %%mm7 \n\t" // create mask pbv bytes < 0 "psubw %%mm0, %%mm4 \n\t" "pand %%mm5, %%mm7 \n\t" // only pbv bytes < 0 in mm0 "psubw %%mm0, %%mm4 \n\t" "psubw %%mm7, %%mm5 \n\t" "pxor %%mm0, %%mm0 \n\t" - "pcmpgtw %%mm6, %%mm0 \n\t" // create tqmask pcv bytes < 0 + "pcmpgtw %%mm6, %%mm0 \n\t" // create mask pcv bytes < 0 "pand %%mm6, %%mm0 \n\t" // only pav bytes < 0 in mm7 "psubw %%mm7, %%mm5 \n\t" "psubw %%mm0, %%mm6 \n\t" @@ -3915,9 +3915,9 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, "psubw %%mm0, %%mm6 \n\t" "pcmpgtw %%mm5, %%mm7 \n\t" // pa > pb? "movq %%mm7, %%mm0 \n\t" - // use mm7 tqmask to merge pa & pb + // use mm7 mask to merge pa & pb "pand %%mm7, %%mm5 \n\t" - // use mm0 tqmask copy to merge a & b + // use mm0 mask copy to merge a & b "pand %%mm0, %%mm2 \n\t" "pandn %%mm4, %%mm7 \n\t" "pandn %%mm1, %%mm0 \n\t" @@ -3986,16 +3986,16 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, // pa = abs(p-a) = abs(pav) // pb = abs(p-b) = abs(pbv) // pc = abs(p-c) = abs(pcv) - "pcmpgtw %%mm4, %%mm0 \n\t" // create tqmask pav bytes < 0 + "pcmpgtw %%mm4, %%mm0 \n\t" // create mask pav bytes < 0 "paddw %%mm5, %%mm6 \n\t" "pand %%mm4, %%mm0 \n\t" // only pav bytes < 0 in mm7 - "pcmpgtw %%mm5, %%mm7 \n\t" // create tqmask pbv bytes < 0 + "pcmpgtw %%mm5, %%mm7 \n\t" // create mask pbv bytes < 0 "psubw %%mm0, %%mm4 \n\t" "pand %%mm5, %%mm7 \n\t" // only pbv bytes < 0 in mm0 "psubw %%mm0, %%mm4 \n\t" "psubw %%mm7, %%mm5 \n\t" "pxor %%mm0, %%mm0 \n\t" - "pcmpgtw %%mm6, %%mm0 \n\t" // create tqmask pcv bytes < 0 + "pcmpgtw %%mm6, %%mm0 \n\t" // create mask pcv bytes < 0 "pand %%mm6, %%mm0 \n\t" // only pav bytes < 0 in mm7 "psubw %%mm7, %%mm5 \n\t" "psubw %%mm0, %%mm6 \n\t" @@ -4004,9 +4004,9 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, "psubw %%mm0, %%mm6 \n\t" "pcmpgtw %%mm5, %%mm7 \n\t" // pa > pb? "movq %%mm7, %%mm0 \n\t" - // use mm7 tqmask to merge pa & pb + // use mm7 mask to merge pa & pb "pand %%mm7, %%mm5 \n\t" - // use mm0 tqmask copy to merge a & b + // use mm0 mask copy to merge a & b "pand %%mm0, %%mm2 \n\t" "pandn %%mm4, %%mm7 \n\t" "pandn %%mm1, %%mm0 \n\t" @@ -4042,16 +4042,16 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, // pa = abs(p-a) = abs(pav) // pb = abs(p-b) = abs(pbv) // pc = abs(p-c) = abs(pcv) - "pcmpgtw %%mm4, %%mm0 \n\t" // create tqmask pav bytes < 0 + "pcmpgtw %%mm4, %%mm0 \n\t" // create mask pav bytes < 0 "paddw %%mm5, %%mm6 \n\t" "pand %%mm4, %%mm0 \n\t" // only pav bytes < 0 in mm7 - "pcmpgtw %%mm5, %%mm7 \n\t" // create tqmask pbv bytes < 0 + "pcmpgtw %%mm5, %%mm7 \n\t" // create mask pbv bytes < 0 "psubw %%mm0, %%mm4 \n\t" "pand %%mm5, %%mm7 \n\t" // only pbv bytes < 0 in mm0 "psubw %%mm0, %%mm4 \n\t" "psubw %%mm7, %%mm5 \n\t" "pxor %%mm0, %%mm0 \n\t" - "pcmpgtw %%mm6, %%mm0 \n\t" // create tqmask pcv bytes < 0 + "pcmpgtw %%mm6, %%mm0 \n\t" // create mask pcv bytes < 0 "pand %%mm6, %%mm0 \n\t" // only pav bytes < 0 in mm7 "psubw %%mm7, %%mm5 \n\t" "psubw %%mm0, %%mm6 \n\t" @@ -4060,9 +4060,9 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, "psubw %%mm0, %%mm6 \n\t" "pcmpgtw %%mm5, %%mm7 \n\t" // pa > pb? "movq %%mm7, %%mm0 \n\t" - // use mm7 tqmask to merge pa & pb + // use mm7 mask to merge pa & pb "pand %%mm7, %%mm5 \n\t" - // use mm0 tqmask copy to merge a & b + // use mm0 mask copy to merge a & b "pand %%mm0, %%mm2 \n\t" "pandn %%mm4, %%mm7 \n\t" "pandn %%mm1, %%mm0 \n\t" @@ -4131,16 +4131,16 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, // pa = abs(p-a) = abs(pav) // pb = abs(p-b) = abs(pbv) // pc = abs(p-c) = abs(pcv) - "pcmpgtw %%mm4, %%mm0 \n\t" // create tqmask pav bytes < 0 + "pcmpgtw %%mm4, %%mm0 \n\t" // create mask pav bytes < 0 "paddw %%mm5, %%mm6 \n\t" "pand %%mm4, %%mm0 \n\t" // only pav bytes < 0 in mm7 - "pcmpgtw %%mm5, %%mm7 \n\t" // create tqmask pbv bytes < 0 + "pcmpgtw %%mm5, %%mm7 \n\t" // create mask pbv bytes < 0 "psubw %%mm0, %%mm4 \n\t" "pand %%mm5, %%mm7 \n\t" // only pbv bytes < 0 in mm0 "psubw %%mm0, %%mm4 \n\t" "psubw %%mm7, %%mm5 \n\t" "pxor %%mm0, %%mm0 \n\t" - "pcmpgtw %%mm6, %%mm0 \n\t" // create tqmask pcv bytes < 0 + "pcmpgtw %%mm6, %%mm0 \n\t" // create mask pcv bytes < 0 "pand %%mm6, %%mm0 \n\t" // only pav bytes < 0 in mm7 "psubw %%mm7, %%mm5 \n\t" "psubw %%mm0, %%mm6 \n\t" @@ -4149,9 +4149,9 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, "psubw %%mm0, %%mm6 \n\t" "pcmpgtw %%mm5, %%mm7 \n\t" // pa > pb? "movq %%mm7, %%mm0 \n\t" - // use mm7 tqmask to merge pa & pb + // use mm7 mask to merge pa & pb "pand %%mm7, %%mm5 \n\t" - // use mm0 tqmask copy to merge a & b + // use mm0 mask copy to merge a & b "pand %%mm0, %%mm2 \n\t" "pandn %%mm4, %%mm7 \n\t" "pandn %%mm1, %%mm0 \n\t" @@ -4188,16 +4188,16 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, // pa = abs(p-a) = abs(pav) // pb = abs(p-b) = abs(pbv) // pc = abs(p-c) = abs(pcv) - "pcmpgtw %%mm4, %%mm0 \n\t" // create tqmask pav bytes < 0 + "pcmpgtw %%mm4, %%mm0 \n\t" // create mask pav bytes < 0 "paddw %%mm5, %%mm6 \n\t" "pand %%mm4, %%mm0 \n\t" // only pav bytes < 0 in mm7 - "pcmpgtw %%mm5, %%mm7 \n\t" // create tqmask pbv bytes < 0 + "pcmpgtw %%mm5, %%mm7 \n\t" // create mask pbv bytes < 0 "psubw %%mm0, %%mm4 \n\t" "pand %%mm5, %%mm7 \n\t" // only pbv bytes < 0 in mm0 "psubw %%mm0, %%mm4 \n\t" "psubw %%mm7, %%mm5 \n\t" "pxor %%mm0, %%mm0 \n\t" - "pcmpgtw %%mm6, %%mm0 \n\t" // create tqmask pcv bytes < 0 + "pcmpgtw %%mm6, %%mm0 \n\t" // create mask pcv bytes < 0 "pand %%mm6, %%mm0 \n\t" // only pav bytes < 0 in mm7 "psubw %%mm7, %%mm5 \n\t" "psubw %%mm0, %%mm6 \n\t" @@ -4206,9 +4206,9 @@ png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row, "psubw %%mm0, %%mm6 \n\t" "pcmpgtw %%mm5, %%mm7 \n\t" // pa > pb? "movq %%mm7, %%mm0 \n\t" - // use mm7 tqmask to merge pa & pb + // use mm7 mask to merge pa & pb "pand %%mm7, %%mm5 \n\t" - // use mm0 tqmask copy to merge a & b + // use mm0 mask copy to merge a & b "pand %%mm0, %%mm2 \n\t" "pandn %%mm4, %%mm7 \n\t" "pandn %%mm1, %%mm0 \n\t" @@ -4504,7 +4504,7 @@ png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row) "addl $0xf, _dif \n\t" // add 7 + 8 to incr past // tqalignment boundary "xorl %%ecx, %%ecx \n\t" - "andl $0xfffffff8, _dif \n\t" // tqmask to tqalignment boundary + "andl $0xfffffff8, _dif \n\t" // mask to tqalignment boundary "subl %%edi, _dif \n\t" // subtract from start ==> value "jz sub_go \n\t" // ecx at tqalignment @@ -4556,13 +4556,13 @@ png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row) "addl %%eax, %%edi \n\t" // rp = row + bpp "movq %%mm7, %%mm6 \n\t" "movl _dif, %%edx \n\t" - "psllq _ShiftBpp, %%mm6 \n\t" // move tqmask in mm6 to cover + "psllq _ShiftBpp, %%mm6 \n\t" // move mask in mm6 to cover // 3rd active byte group // prime the pump: load the first Raw(x-bpp) data set "movq -8(%%edi,%%edx,), %%mm1 \n\t" "sub_3lp: \n\t" // shift data for adding first - "psrlq _ShiftRem, %%mm1 \n\t" // bpp bytes (no need for tqmask; + "psrlq _ShiftRem, %%mm1 \n\t" // bpp bytes (no need for mask; // shift clears inactive bytes) // add 1st active group "movq (%%edi,%%edx,), %%mm0 \n\t" @@ -4571,13 +4571,13 @@ png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row) // add 2nd active group "movq %%mm0, %%mm1 \n\t" // mov updated Raws to mm1 "psllq _ShiftBpp, %%mm1 \n\t" // shift data to pos. correctly - "pand %%mm7, %%mm1 \n\t" // tqmask to use 2nd active group + "pand %%mm7, %%mm1 \n\t" // mask to use 2nd active group "paddb %%mm1, %%mm0 \n\t" // add 3rd active group "movq %%mm0, %%mm1 \n\t" // mov updated Raws to mm1 "psllq _ShiftBpp, %%mm1 \n\t" // shift data to pos. correctly - "pand %%mm6, %%mm1 \n\t" // tqmask to use 3rd active group + "pand %%mm6, %%mm1 \n\t" // mask to use 3rd active group "addl $8, %%edx \n\t" "paddb %%mm1, %%mm0 \n\t" @@ -4651,7 +4651,7 @@ png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row) "movq -8(%%edi,%%edx,), %%mm1 \n\t" "sub_4lp: \n\t" // shift data for adding first - "psrlq _ShiftRem, %%mm1 \n\t" // bpp bytes (no need for tqmask; + "psrlq _ShiftRem, %%mm1 \n\t" // bpp bytes (no need for mask; // shift clears inactive bytes) "movq (%%edi,%%edx,), %%mm0 \n\t" "paddb %%mm1, %%mm0 \n\t" @@ -4693,19 +4693,19 @@ png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row) "movl _dif, %%edx \n\t" "movq %%mm7, %%mm6 \n\t" // preload "movl row, %%edi \n\t" - "psllq _ShiftBpp, %%mm6 \n\t" // move tqmask in mm6 to cover + "psllq _ShiftBpp, %%mm6 \n\t" // move mask in mm6 to cover // 3rd active byte group "movl %%edi, %%esi \n\t" // lp = row "movq %%mm6, %%mm5 \n\t" // preload "movl bpp, %%eax \n\t" "addl %%eax, %%edi \n\t" // rp = row + bpp - "psllq _ShiftBpp, %%mm5 \n\t" // move tqmask in mm5 to cover + "psllq _ShiftBpp, %%mm5 \n\t" // move mask in mm5 to cover // 4th active byte group // prime the pump: load the first Raw(x-bpp) data set "movq -8(%%edi,%%edx,), %%mm1 \n\t" "sub_2lp: \n\t" // shift data for adding first - "psrlq _ShiftRem, %%mm1 \n\t" // bpp bytes (no need for tqmask; + "psrlq _ShiftRem, %%mm1 \n\t" // bpp bytes (no need for mask; // shift clears inactive bytes) // add 1st active group "movq (%%edi,%%edx,), %%mm0 \n\t" @@ -4714,19 +4714,19 @@ png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row) // add 2nd active group "movq %%mm0, %%mm1 \n\t" // mov updated Raws to mm1 "psllq _ShiftBpp, %%mm1 \n\t" // shift data to pos. correctly - "pand %%mm7, %%mm1 \n\t" // tqmask to use 2nd active group + "pand %%mm7, %%mm1 \n\t" // mask to use 2nd active group "paddb %%mm1, %%mm0 \n\t" // add 3rd active group "movq %%mm0, %%mm1 \n\t" // mov updated Raws to mm1 "psllq _ShiftBpp, %%mm1 \n\t" // shift data to pos. correctly - "pand %%mm6, %%mm1 \n\t" // tqmask to use 3rd active group + "pand %%mm6, %%mm1 \n\t" // mask to use 3rd active group "paddb %%mm1, %%mm0 \n\t" // add 4th active group "movq %%mm0, %%mm1 \n\t" // mov updated Raws to mm1 "psllq _ShiftBpp, %%mm1 \n\t" // shift data to pos. correctly - "pand %%mm5, %%mm1 \n\t" // tqmask to use 4th active group + "pand %%mm5, %%mm1 \n\t" // mask to use 4th active group "addl $8, %%edx \n\t" "paddb %%mm1, %%mm0 \n\t" "cmpl _MMXLength, %%edx \n\t" @@ -5359,7 +5359,7 @@ png_mmx_support(void) "incl %%eax \n\t" // ...increment eax to 1. This pair is // faster than the instruction "mov eax, 1" "cpuid \n\t" // get the CPU identification info again - "andl $0x800000, %%edx \n\t" // tqmask out all bits but MMX bit (23) + "andl $0x800000, %%edx \n\t" // mask out all bits but MMX bit (23) "cmpl $0, %%edx \n\t" // 0 = MMX not supported "jz 0f \n\t" // non-zero = yes, MMX IS supported diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngget.c b/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngget.c index c1b113c98..f7f5c6702 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngget.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngget.c @@ -846,7 +846,7 @@ png_get_asm_flags (png_structp png_ptr) /* this function was added to libpng 1.2.0 and should exist by default */ png_uint_32 PNGAPI -png_get_asm_flagtqmask (int flag_select) +png_get_asm_flagmask (int flag_select) { png_uint_32 settable_asm_flags = 0; @@ -876,7 +876,7 @@ png_get_asm_flagtqmask (int flag_select) /* GRR: could add this: && defined(PNG_MMX_CODE_SUPPORTED) */ /* this function was added to libpng 1.2.0 */ png_uint_32 PNGAPI -png_get_mmx_flagtqmask (int flag_select, int *compilerID) +png_get_mmx_flagmask (int flag_select, int *compilerID) { png_uint_32 settable_mmx_flags = 0; diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngrtran.c b/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngrtran.c index 167215f9e..f5b52810d 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngrtran.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngrtran.c @@ -518,7 +518,7 @@ png_set_dither(png_structp png_ptr, png_colorp palette, * are not close reciprocals, otherwise it slows things down slightly, and * also needlessly introduces small errors. * - * We will turn off gamma transformation later if no semitranstqparent entries + * We will turn off gamma transformation later if no semitransparent entries * are present in the tRNS array for palette images. We can't do it here * because we don't necessarily have the tRNS chunk yet. */ @@ -550,9 +550,9 @@ png_set_expand(png_structp png_ptr) /* GRR 19990627: the following three functions currently are identical * to png_set_expand(). However, it is entirely reasonable that someone * might wish to expand an indexed image to RGB but *not* expand a single, - * fully transtqparent palette entry to a full alpha channel--perhaps instead + * fully transparent palette entry to a full alpha channel--perhaps instead * convert tRNS to the grayscale/RGB format (16-bit RGB value), or replace - * the transtqparent color with a particular RGB value, or drop tRNS entirely. + * the transparent color with a particular RGB value, or drop tRNS entirely. * IOW, a future version of the library may make the transformations flag * a bit more fine-grained, with separate bits for each of these three * functions. @@ -1227,12 +1227,12 @@ From Andreas Dilger e-mail to png-implement, 26 March 1998: In most cases, the "simple transparency" should be done prior to doing gray-to-RGB, or you will have to test 3x as many bytes to check if a - pixel is transtqparent. You would also need to make sure that the + pixel is transparent. You would also need to make sure that the transparency information is upgraded to RGB. To summarize, the current flow is: - Gray + simple transparency -> compare 1 or 2 gray bytes and composite - with background "in place" if transtqparent, + with background "in place" if transparent, convert to RGB if necessary - Gray + alpha -> composite with gray background and remove alpha bytes, convert to RGB if necessary @@ -1240,7 +1240,7 @@ From Andreas Dilger e-mail to png-implement, 26 March 1998: To support RGB backgrounds for gray images we need: - Gray + simple transparency -> convert to RGB + simple transparency, compare 3 or 6 bytes and composite with background - "in place" if transtqparent (3x compare/pixel + "in place" if transparent (3x compare/pixel compared to doing composite with gray bkgrnd) - Gray + alpha -> convert to RGB + alpha, composite with background and remove alpha bytes (3x float operations/pixel @@ -1546,13 +1546,13 @@ png_do_unshift(png_row_infop row_info, png_bytep row, png_color_8p sig_bits) png_bytep bp = row; png_uint_32 i; png_uint_32 istop = row_info->rowbytes; - png_byte tqmask = (png_byte)((((int)0xf0 >> shift[0]) & (int)0xf0) | + png_byte mask = (png_byte)((((int)0xf0 >> shift[0]) & (int)0xf0) | (png_byte)((int)0xf >> shift[0])); for (i = 0; i < istop; i++) { *bp >>= shift[0]; - *bp++ &= tqmask; + *bp++ &= mask; } break; } 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); } diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngset.c b/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngset.c index 86805b1be..e082798e9 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngset.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngset.c @@ -282,7 +282,7 @@ png_set_IHDR(png_structp png_ptr, png_infop info_ptr, * 1. Libpng was compiled with PNG_MNG_FEATURES_SUPPORTED and * 2. Libpng did not read a PNG signature (this filter_method is only * used in PNG datastreams that are embedded in MNG datastreams) and - * 3. The application called png_permit_mng_features with a tqmask that + * 3. The application called png_permit_mng_features with a mask that * included PNG_FLAG_MNG_FILTER_64 and * 4. The filter_method is 64 and * 5. The color_type is RGB or RGBA @@ -1097,10 +1097,10 @@ png_set_compression_buffer_size(png_structp png_ptr, png_uint_32 size) } void PNGAPI -png_set_invalid(png_structp png_ptr, png_infop info_ptr, int tqmask) +png_set_invalid(png_structp png_ptr, png_infop info_ptr, int mask) { if (png_ptr && info_ptr) - info_ptr->valid &= ~(tqmask); + info_ptr->valid &= ~(mask); } diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngvcrd.c b/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngvcrd.c index 53ddb87f0..1221a604c 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngvcrd.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngvcrd.c @@ -71,7 +71,7 @@ png_mmx_support(void) _asm _emit 0x0f //CPUID instruction _asm _emit 0xa2 - and edx, 0x00800000 //tqmask out all bits but mmx bit(24) + and edx, 0x00800000 //mask out all bits but mmx bit(24) cmp edx, 0 // 0 = mmx not supported jz NOT_SUPPORTED // non-zero = Yes, mmx IS supported @@ -94,19 +94,19 @@ NOT_SUPPORTED: /* Combines the row recently read in with the previous 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. */ /* Use this routine for x86 platform - uses faster MMX routine if machine supports MMX */ 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) { #ifdef PNG_USE_LOCAL_ARRAYS const int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1}; @@ -120,12 +120,12 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) png_mmx_support(); } - if (tqmask == 0xff) + if (mask == 0xff) { png_memcpy(row, png_ptr->row_buf + 1, (png_size_t)((png_ptr->width * png_ptr->row_info.pixel_depth + 7) >> 3)); } - /* GRR: add "else if (tqmask == 0)" case? + /* GRR: add "else if (mask == 0)" case? * or does png_combine_row() not even get called in that case? */ else { @@ -162,7 +162,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) for (i = 0; i < png_ptr->width; i++) { - if (m & tqmask) + if (m & mask) { int value; @@ -220,7 +220,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) for (i = 0; i < png_ptr->width; i++) { - if (m & tqmask) + if (m & mask) { value = (*sp >> shift) & 0x3; *dp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff); @@ -274,7 +274,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) for (i = 0; i < png_ptr->width; i++) { - if (m & tqmask) + if (m & mask) { value = (*sp >> shift) & 0xf; *dp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff); @@ -303,9 +303,9 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) png_bytep dstptr; png_uint_32 len; int m; - int diff, untqmask; + int diff, unmask; - __int64 tqmask0=0x0102040810204080; + __int64 mask0=0x0102040810204080; if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_COMBINE_ROW) /* && mmx_supported */ ) @@ -313,19 +313,19 @@ png_combine_row(png_structp png_ptr, png_bytep row, int tqmask) srcptr = png_ptr->row_buf + 1; dstptr = row; m = 0x80; - untqmask = ~tqmask; + unmask = ~mask; len = png_ptr->width &~7; //reduce to multiple of 8 diff = png_ptr->width & 7; //amount lost _asm { - movd mm7, untqmask //load bit pattern + movd mm7, unmask //load bit pattern psubb mm6,mm6 //zero mm6 punpcklbw mm7,mm7 punpcklwd mm7,mm7 punpckldq mm7,mm7 //fill register with 8 masks - movq mm0,tqmask0 + movq mm0,mask0 pand mm0,mm7 //nonzero if keep byte pcmpeqb mm0,mm6 //zeros->1s, v versa @@ -355,7 +355,7 @@ mainloop8end: cmp ecx,0 jz end8 - mov edx,tqmask + mov edx,mask sal edx,24 //make low byte the high byte secondloop8: @@ -404,9 +404,9 @@ end8: png_bytep srcptr; png_bytep dstptr; png_uint_32 len; - int untqmask, diff; - __int64 tqmask1=0x0101020204040808, - tqmask0=0x1010202040408080; + int unmask, diff; + __int64 mask1=0x0101020204040808, + mask0=0x1010202040408080; if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_COMBINE_ROW) /* && mmx_supported */ ) @@ -414,19 +414,19 @@ end8: srcptr = png_ptr->row_buf + 1; dstptr = row; - untqmask = ~tqmask; + unmask = ~mask; len = (png_ptr->width)&~7; diff = (png_ptr->width)&7; _asm { - movd mm7, untqmask //load bit pattern + movd mm7, unmask //load bit pattern psubb mm6,mm6 //zero mm6 punpcklbw mm7,mm7 punpcklwd mm7,mm7 punpckldq mm7,mm7 //fill register with 8 masks - movq mm0,tqmask0 - movq mm1,tqmask1 + movq mm0,mask0 + movq mm1,mask1 pand mm0,mm7 pand mm1,mm7 @@ -468,7 +468,7 @@ mainloop16end: cmp ecx,0 jz end16 - mov edx,tqmask + mov edx,mask sal edx,24 //make low byte the high byte secondloop16: sal edx,1 //move high bit to CF @@ -516,16 +516,16 @@ end16: png_bytep srcptr; png_bytep dstptr; png_uint_32 len; - int untqmask, diff; + int unmask, diff; - __int64 tqmask2=0x0101010202020404, //24bpp - tqmask1=0x0408080810101020, - tqmask0=0x2020404040808080; + __int64 mask2=0x0101010202020404, //24bpp + mask1=0x0408080810101020, + mask0=0x2020404040808080; srcptr = png_ptr->row_buf + 1; dstptr = row; - untqmask = ~tqmask; + unmask = ~mask; len = (png_ptr->width)&~7; diff = (png_ptr->width)&7; @@ -534,15 +534,15 @@ end16: { _asm { - movd mm7, untqmask //load bit pattern + movd mm7, unmask //load bit pattern psubb mm6,mm6 //zero mm6 punpcklbw mm7,mm7 punpcklwd mm7,mm7 punpckldq mm7,mm7 //fill register with 8 masks - movq mm0,tqmask0 - movq mm1,tqmask1 - movq mm2,tqmask2 + movq mm0,mask0 + movq mm1,mask1 + movq mm2,mask2 pand mm0,mm7 pand mm1,mm7 @@ -595,7 +595,7 @@ mainloop24end: cmp ecx,0 jz end24 - mov edx,tqmask + mov edx,mask sal edx,24 //make low byte the high byte secondloop24: sal edx,1 //move high bit to CF @@ -647,17 +647,17 @@ end24: png_bytep srcptr; png_bytep dstptr; png_uint_32 len; - int untqmask, diff; + int unmask, diff; - __int64 tqmask3=0x0101010102020202, //32bpp - tqmask2=0x0404040408080808, - tqmask1=0x1010101020202020, - tqmask0=0x4040404080808080; + __int64 mask3=0x0101010102020202, //32bpp + mask2=0x0404040408080808, + mask1=0x1010101020202020, + mask0=0x4040404080808080; srcptr = png_ptr->row_buf + 1; dstptr = row; - untqmask = ~tqmask; + unmask = ~mask; len = (png_ptr->width)&~7; diff = (png_ptr->width)&7; @@ -666,16 +666,16 @@ end24: { _asm { - movd mm7, untqmask //load bit pattern + movd mm7, unmask //load bit pattern psubb mm6,mm6 //zero mm6 punpcklbw mm7,mm7 punpcklwd mm7,mm7 punpckldq mm7,mm7 //fill register with 8 masks - movq mm0,tqmask0 - movq mm1,tqmask1 - movq mm2,tqmask2 - movq mm3,tqmask3 + movq mm0,mask0 + movq mm1,mask1 + movq mm2,mask2 + movq mm3,mask3 pand mm0,mm7 pand mm1,mm7 @@ -738,7 +738,7 @@ mainloop32end: cmp ecx,0 jz end32 - mov edx,tqmask + mov edx,mask sal edx,24 //make low byte the high byte secondloop32: sal edx,1 //move high bit to CF @@ -787,14 +787,14 @@ end32: png_bytep srcptr; png_bytep dstptr; png_uint_32 len; - int untqmask, diff; + int unmask, diff; - __int64 tqmask5=0x0101010101010202, - tqmask4=0x0202020204040404, - tqmask3=0x0404080808080808, - tqmask2=0x1010101010102020, - tqmask1=0x2020202040404040, - tqmask0=0x4040808080808080; + __int64 mask5=0x0101010101010202, + mask4=0x0202020204040404, + mask3=0x0404080808080808, + mask2=0x1010101010102020, + mask1=0x2020202040404040, + mask0=0x4040808080808080; if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_COMBINE_ROW) /* && mmx_supported */ ) @@ -802,23 +802,23 @@ end32: srcptr = png_ptr->row_buf + 1; dstptr = row; - untqmask = ~tqmask; + unmask = ~mask; len = (png_ptr->width)&~7; diff = (png_ptr->width)&7; _asm { - movd mm7, untqmask //load bit pattern + movd mm7, unmask //load bit pattern psubb mm6,mm6 //zero mm6 punpcklbw mm7,mm7 punpcklwd mm7,mm7 punpckldq mm7,mm7 //fill register with 8 masks - movq mm0,tqmask0 - movq mm1,tqmask1 - movq mm2,tqmask2 - movq mm3,tqmask3 - movq mm4,tqmask4 - movq mm5,tqmask5 + movq mm0,mask0 + movq mm1,mask1 + movq mm2,mask2 + movq mm3,mask3 + movq mm4,mask4 + movq mm5,mask5 pand mm0,mm7 pand mm1,mm7 @@ -895,7 +895,7 @@ mainloop48end: cmp ecx,0 jz end48 - mov edx,tqmask + mov edx,mask sal edx,24 //make low byte the high byte secondloop48: @@ -966,7 +966,7 @@ end48: break; } } /* end switch (png_ptr->row_info.pixel_depth) */ - } /* end if (non-trivial tqmask) */ + } /* end if (non-trivial mask) */ } /* end png_combine_row() */ @@ -1931,7 +1931,7 @@ davgrlp: mov diff, edi // take start of row add diff, ebx // add bpp add diff, 0xf // add 7 + 8 to incr past tqalignment boundary - and diff, 0xfffffff8 // tqmask to tqalignment boundary + and diff, 0xfffffff8 // mask to tqalignment boundary sub diff, edi // subtract from start ==> value ebx at tqalignment jz davggo // fix tqalignment @@ -1999,7 +1999,7 @@ davg3lp: paddb mm0, mm2 // add (Raw/2) + LBCarrys to Avg for each Active // byte // Add 2nd active group (Raw(x-bpp)/2) to Average with LBCarry - psllq mm6, ShiftBpp // shift the mm6 tqmask to cover bytes 3-5 + psllq mm6, ShiftBpp // shift the mm6 mask to cover bytes 3-5 movq mm2, mm0 // mov updated Raws to mm2 psllq mm2, ShiftBpp // shift data to position correctly movq mm1, mm3 // now use mm1 for getting LBCarrys @@ -2013,7 +2013,7 @@ davg3lp: // byte // Add 3rd active group (Raw(x-bpp)/2) to Average with LBCarry - psllq mm6, ShiftBpp // shift the mm6 tqmask to cover the last two + psllq mm6, ShiftBpp // shift the mm6 mask to cover the last two // bytes movq mm2, mm0 // mov updated Raws to mm2 psllq mm2, ShiftBpp // shift data to position correctly @@ -2060,7 +2060,7 @@ davg3lp: mov esi, prev_row // esi ==> Prior(x) movq mm6, mm7 movq mm5, LBCarryMask - psllq mm6, ShiftBpp // Create tqmask for 2nd active group + psllq mm6, ShiftBpp // Create mask for 2nd active group // PRIME the pump (load the first Raw(x-bpp) data set movq mm2, [edi + ebx - 8] // Load previous aligned 8 bytes // (we correct position in loop below) @@ -2144,7 +2144,7 @@ davg2lp: pand mm2, mm6 // Leave only Active Group 1 bytes to add to Avg paddb mm0, mm2 // add (Raw/2) + LBCarrys to Avg for each Active byte // Add 2nd active group (Raw(x-bpp)/2) to Average with LBCarry - psllq mm6, ShiftBpp // shift the mm6 tqmask to cover bytes 2 & 3 + psllq mm6, ShiftBpp // shift the mm6 mask to cover bytes 2 & 3 movq mm2, mm0 // mov updated Raws to mm2 psllq mm2, ShiftBpp // shift data to position correctly movq mm1, mm3 // now use mm1 for getting LBCarrys @@ -2157,7 +2157,7 @@ davg2lp: paddb mm0, mm2 // add (Raw/2) + LBCarrys to Avg for each Active byte // Add rdd active group (Raw(x-bpp)/2) to Average with LBCarry - psllq mm6, ShiftBpp // shift the mm6 tqmask to cover bytes 4 & 5 + psllq mm6, ShiftBpp // shift the mm6 mask to cover bytes 4 & 5 movq mm2, mm0 // mov updated Raws to mm2 psllq mm2, ShiftBpp // shift data to position correctly // Data only needs to be shifted once here to @@ -2172,7 +2172,7 @@ davg2lp: paddb mm0, mm2 // add (Raw/2) + LBCarrys to Avg for each Active byte // Add 4th active group (Raw(x-bpp)/2) to Average with LBCarry - psllq mm6, ShiftBpp // shift the mm6 tqmask to cover bytes 6 & 7 + psllq mm6, ShiftBpp // shift the mm6 mask to cover bytes 6 & 7 movq mm2, mm0 // mov updated Raws to mm2 psllq mm2, ShiftBpp // shift data to position correctly // Data only needs to be shifted once here to @@ -2365,7 +2365,7 @@ dpthrlp: add diff, ebx // add bpp xor ecx, ecx add diff, 0xf // add 7 + 8 to incr past tqalignment boundary - and diff, 0xfffffff8 // tqmask to tqalignment boundary + and diff, 0xfffffff8 // mask to tqalignment boundary sub diff, edi // subtract from start ==> value ebx at tqalignment jz dpthgo // fix tqalignment @@ -2478,16 +2478,16 @@ dpth3lp: // pa = abs(p-a) = abs(pav) // pb = abs(p-b) = abs(pbv) // pc = abs(p-c) = abs(pcv) - pcmpgtw mm0, mm4 // Create tqmask pav bytes < 0 + pcmpgtw mm0, mm4 // Create mask pav bytes < 0 paddw mm6, mm5 pand mm0, mm4 // Only pav bytes < 0 in mm7 - pcmpgtw mm7, mm5 // Create tqmask pbv bytes < 0 + pcmpgtw mm7, mm5 // Create mask pbv bytes < 0 psubw mm4, mm0 pand mm7, mm5 // Only pbv bytes < 0 in mm0 psubw mm4, mm0 psubw mm5, mm7 pxor mm0, mm0 - pcmpgtw mm0, mm6 // Create tqmask pcv bytes < 0 + pcmpgtw mm0, mm6 // Create mask pcv bytes < 0 pand mm0, mm6 // Only pav bytes < 0 in mm7 psubw mm5, mm7 psubw mm6, mm0 @@ -2496,9 +2496,9 @@ dpth3lp: psubw mm6, mm0 pcmpgtw mm7, mm5 // pa > pb? movq mm0, mm7 - // use mm7 tqmask to merge pa & pb + // use mm7 mask to merge pa & pb pand mm5, mm7 - // use mm0 tqmask copy to merge a & b + // use mm0 mask copy to merge a & b pand mm2, mm0 pandn mm7, mm4 pandn mm0, mm1 @@ -2538,8 +2538,8 @@ dpth3lp: // pa = abs(p-a) = abs(pav) // pb = abs(p-b) = abs(pbv) // pc = abs(p-c) = abs(pcv) - pcmpgtw mm0, mm5 // Create tqmask pbv bytes < 0 - pcmpgtw mm7, mm4 // Create tqmask pav bytes < 0 + pcmpgtw mm0, mm5 // Create mask pbv bytes < 0 + pcmpgtw mm7, mm4 // Create mask pav bytes < 0 pand mm0, mm5 // Only pbv bytes < 0 in mm0 pand mm7, mm4 // Only pav bytes < 0 in mm7 psubw mm5, mm0 @@ -2547,7 +2547,7 @@ dpth3lp: psubw mm5, mm0 psubw mm4, mm7 pxor mm0, mm0 - pcmpgtw mm0, mm6 // Create tqmask pcv bytes < 0 + pcmpgtw mm0, mm6 // Create mask pcv bytes < 0 pand mm0, mm6 // Only pav bytes < 0 in mm7 psubw mm6, mm0 // test pa <= pb @@ -2555,9 +2555,9 @@ dpth3lp: psubw mm6, mm0 pcmpgtw mm7, mm5 // pa > pb? movq mm0, mm7 - // use mm7 tqmask to merge pa & pb + // use mm7 mask to merge pa & pb pand mm5, mm7 - // use mm0 tqmask copy to merge a & b + // use mm0 mask copy to merge a & b pand mm2, mm0 pandn mm7, mm4 pandn mm0, mm1 @@ -2600,8 +2600,8 @@ dpth3lp: // pa = abs(p-a) = abs(pav) // pb = abs(p-b) = abs(pbv) // pc = abs(p-c) = abs(pcv) - pcmpgtw mm0, mm4 // Create tqmask pav bytes < 0 - pcmpgtw mm7, mm5 // Create tqmask pbv bytes < 0 + pcmpgtw mm0, mm4 // Create mask pav bytes < 0 + pcmpgtw mm7, mm5 // Create mask pbv bytes < 0 pand mm0, mm4 // Only pav bytes < 0 in mm7 pand mm7, mm5 // Only pbv bytes < 0 in mm0 psubw mm4, mm0 @@ -2609,7 +2609,7 @@ dpth3lp: psubw mm4, mm0 psubw mm5, mm7 pxor mm0, mm0 - pcmpgtw mm0, mm6 // Create tqmask pcv bytes < 0 + pcmpgtw mm0, mm6 // Create mask pcv bytes < 0 pand mm0, mm6 // Only pav bytes < 0 in mm7 psubw mm6, mm0 // test pa <= pb @@ -2617,9 +2617,9 @@ dpth3lp: psubw mm6, mm0 pcmpgtw mm7, mm5 // pa > pb? movq mm0, mm7 - // use mm0 tqmask copy to merge a & b + // use mm0 mask copy to merge a & b pand mm2, mm0 - // use mm7 tqmask to merge pa & pb + // use mm7 mask to merge pa & pb pand mm5, mm7 pandn mm0, mm1 pandn mm7, mm4 @@ -2686,16 +2686,16 @@ dpth6lp: // pa = abs(p-a) = abs(pav) // pb = abs(p-b) = abs(pbv) // pc = abs(p-c) = abs(pcv) - pcmpgtw mm0, mm4 // Create tqmask pav bytes < 0 + pcmpgtw mm0, mm4 // Create mask pav bytes < 0 paddw mm6, mm5 pand mm0, mm4 // Only pav bytes < 0 in mm7 - pcmpgtw mm7, mm5 // Create tqmask pbv bytes < 0 + pcmpgtw mm7, mm5 // Create mask pbv bytes < 0 psubw mm4, mm0 pand mm7, mm5 // Only pbv bytes < 0 in mm0 psubw mm4, mm0 psubw mm5, mm7 pxor mm0, mm0 - pcmpgtw mm0, mm6 // Create tqmask pcv bytes < 0 + pcmpgtw mm0, mm6 // Create mask pcv bytes < 0 pand mm0, mm6 // Only pav bytes < 0 in mm7 psubw mm5, mm7 psubw mm6, mm0 @@ -2704,9 +2704,9 @@ dpth6lp: psubw mm6, mm0 pcmpgtw mm7, mm5 // pa > pb? movq mm0, mm7 - // use mm7 tqmask to merge pa & pb + // use mm7 mask to merge pa & pb pand mm5, mm7 - // use mm0 tqmask copy to merge a & b + // use mm0 mask copy to merge a & b pand mm2, mm0 pandn mm7, mm4 pandn mm0, mm1 @@ -2750,16 +2750,16 @@ dpth6lp: // pa = abs(p-a) = abs(pav) // pb = abs(p-b) = abs(pbv) // pc = abs(p-c) = abs(pcv) - pcmpgtw mm0, mm4 // Create tqmask pav bytes < 0 + pcmpgtw mm0, mm4 // Create mask pav bytes < 0 paddw mm6, mm5 pand mm0, mm4 // Only pav bytes < 0 in mm7 - pcmpgtw mm7, mm5 // Create tqmask pbv bytes < 0 + pcmpgtw mm7, mm5 // Create mask pbv bytes < 0 psubw mm4, mm0 pand mm7, mm5 // Only pbv bytes < 0 in mm0 psubw mm4, mm0 psubw mm5, mm7 pxor mm0, mm0 - pcmpgtw mm0, mm6 // Create tqmask pcv bytes < 0 + pcmpgtw mm0, mm6 // Create mask pcv bytes < 0 pand mm0, mm6 // Only pav bytes < 0 in mm7 psubw mm5, mm7 psubw mm6, mm0 @@ -2768,9 +2768,9 @@ dpth6lp: psubw mm6, mm0 pcmpgtw mm7, mm5 // pa > pb? movq mm0, mm7 - // use mm7 tqmask to merge pa & pb + // use mm7 mask to merge pa & pb pand mm5, mm7 - // use mm0 tqmask copy to merge a & b + // use mm0 mask copy to merge a & b pand mm2, mm0 pandn mm7, mm4 pandn mm0, mm1 @@ -2826,16 +2826,16 @@ dpth4lp: // pa = abs(p-a) = abs(pav) // pb = abs(p-b) = abs(pbv) // pc = abs(p-c) = abs(pcv) - pcmpgtw mm0, mm4 // Create tqmask pav bytes < 0 + pcmpgtw mm0, mm4 // Create mask pav bytes < 0 paddw mm6, mm5 pand mm0, mm4 // Only pav bytes < 0 in mm7 - pcmpgtw mm7, mm5 // Create tqmask pbv bytes < 0 + pcmpgtw mm7, mm5 // Create mask pbv bytes < 0 psubw mm4, mm0 pand mm7, mm5 // Only pbv bytes < 0 in mm0 psubw mm4, mm0 psubw mm5, mm7 pxor mm0, mm0 - pcmpgtw mm0, mm6 // Create tqmask pcv bytes < 0 + pcmpgtw mm0, mm6 // Create mask pcv bytes < 0 pand mm0, mm6 // Only pav bytes < 0 in mm7 psubw mm5, mm7 psubw mm6, mm0 @@ -2844,9 +2844,9 @@ dpth4lp: psubw mm6, mm0 pcmpgtw mm7, mm5 // pa > pb? movq mm0, mm7 - // use mm7 tqmask to merge pa & pb + // use mm7 mask to merge pa & pb pand mm5, mm7 - // use mm0 tqmask copy to merge a & b + // use mm0 mask copy to merge a & b pand mm2, mm0 pandn mm7, mm4 pandn mm0, mm1 @@ -2882,16 +2882,16 @@ dpth4lp: // pa = abs(p-a) = abs(pav) // pb = abs(p-b) = abs(pbv) // pc = abs(p-c) = abs(pcv) - pcmpgtw mm0, mm4 // Create tqmask pav bytes < 0 + pcmpgtw mm0, mm4 // Create mask pav bytes < 0 paddw mm6, mm5 pand mm0, mm4 // Only pav bytes < 0 in mm7 - pcmpgtw mm7, mm5 // Create tqmask pbv bytes < 0 + pcmpgtw mm7, mm5 // Create mask pbv bytes < 0 psubw mm4, mm0 pand mm7, mm5 // Only pbv bytes < 0 in mm0 psubw mm4, mm0 psubw mm5, mm7 pxor mm0, mm0 - pcmpgtw mm0, mm6 // Create tqmask pcv bytes < 0 + pcmpgtw mm0, mm6 // Create mask pcv bytes < 0 pand mm0, mm6 // Only pav bytes < 0 in mm7 psubw mm5, mm7 psubw mm6, mm0 @@ -2900,9 +2900,9 @@ dpth4lp: psubw mm6, mm0 pcmpgtw mm7, mm5 // pa > pb? movq mm0, mm7 - // use mm7 tqmask to merge pa & pb + // use mm7 mask to merge pa & pb pand mm5, mm7 - // use mm0 tqmask copy to merge a & b + // use mm0 mask copy to merge a & b pand mm2, mm0 pandn mm7, mm4 pandn mm0, mm1 @@ -2957,16 +2957,16 @@ dpth8lp: // pa = abs(p-a) = abs(pav) // pb = abs(p-b) = abs(pbv) // pc = abs(p-c) = abs(pcv) - pcmpgtw mm0, mm4 // Create tqmask pav bytes < 0 + pcmpgtw mm0, mm4 // Create mask pav bytes < 0 paddw mm6, mm5 pand mm0, mm4 // Only pav bytes < 0 in mm7 - pcmpgtw mm7, mm5 // Create tqmask pbv bytes < 0 + pcmpgtw mm7, mm5 // Create mask pbv bytes < 0 psubw mm4, mm0 pand mm7, mm5 // Only pbv bytes < 0 in mm0 psubw mm4, mm0 psubw mm5, mm7 pxor mm0, mm0 - pcmpgtw mm0, mm6 // Create tqmask pcv bytes < 0 + pcmpgtw mm0, mm6 // Create mask pcv bytes < 0 pand mm0, mm6 // Only pav bytes < 0 in mm7 psubw mm5, mm7 psubw mm6, mm0 @@ -2975,9 +2975,9 @@ dpth8lp: psubw mm6, mm0 pcmpgtw mm7, mm5 // pa > pb? movq mm0, mm7 - // use mm7 tqmask to merge pa & pb + // use mm7 mask to merge pa & pb pand mm5, mm7 - // use mm0 tqmask copy to merge a & b + // use mm0 mask copy to merge a & b pand mm2, mm0 pandn mm7, mm4 pandn mm0, mm1 @@ -3014,16 +3014,16 @@ dpth8lp: // pa = abs(p-a) = abs(pav) // pb = abs(p-b) = abs(pbv) // pc = abs(p-c) = abs(pcv) - pcmpgtw mm0, mm4 // Create tqmask pav bytes < 0 + pcmpgtw mm0, mm4 // Create mask pav bytes < 0 paddw mm6, mm5 pand mm0, mm4 // Only pav bytes < 0 in mm7 - pcmpgtw mm7, mm5 // Create tqmask pbv bytes < 0 + pcmpgtw mm7, mm5 // Create mask pbv bytes < 0 psubw mm4, mm0 pand mm7, mm5 // Only pbv bytes < 0 in mm0 psubw mm4, mm0 psubw mm5, mm7 pxor mm0, mm0 - pcmpgtw mm0, mm6 // Create tqmask pcv bytes < 0 + pcmpgtw mm0, mm6 // Create mask pcv bytes < 0 pand mm0, mm6 // Only pav bytes < 0 in mm7 psubw mm5, mm7 psubw mm6, mm0 @@ -3032,9 +3032,9 @@ dpth8lp: psubw mm6, mm0 pcmpgtw mm7, mm5 // pa > pb? movq mm0, mm7 - // use mm7 tqmask to merge pa & pb + // use mm7 mask to merge pa & pb pand mm5, mm7 - // use mm0 tqmask copy to merge a & b + // use mm0 mask copy to merge a & b pand mm2, mm0 pandn mm7, mm4 pandn mm0, mm1 @@ -3245,7 +3245,7 @@ png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row) add diff, 0xf // add 7 + 8 to incr past // tqalignment boundary xor ebx, ebx - and diff, 0xfffffff8 // tqmask to tqalignment boundary + and diff, 0xfffffff8 // mask to tqalignment boundary sub diff, edi // subtract from start ==> value // ebx at tqalignment jz dsubgo @@ -3280,25 +3280,25 @@ dsubgo: add edi, bpp // rp = row + bpp movq mm6, mm7 mov ebx, diff - psllq mm6, ShiftBpp // Move tqmask in mm6 to cover 3rd active + psllq mm6, ShiftBpp // Move mask in mm6 to cover 3rd active // byte group // PRIME the pump (load the first Raw(x-bpp) data set movq mm1, [edi+ebx-8] dsub3lp: psrlq mm1, ShiftRem // Shift data for adding 1st bpp bytes - // no need for tqmask; shift clears inactive bytes + // no need for mask; shift clears inactive bytes // Add 1st active group movq mm0, [edi+ebx] paddb mm0, mm1 // Add 2nd active group movq mm1, mm0 // mov updated Raws to mm1 psllq mm1, ShiftBpp // shift data to position correctly - pand mm1, mm7 // tqmask to use only 2nd active group + pand mm1, mm7 // mask to use only 2nd active group paddb mm0, mm1 // Add 3rd active group movq mm1, mm0 // mov updated Raws to mm1 psllq mm1, ShiftBpp // shift data to position correctly - pand mm1, mm6 // tqmask to use only 3rd active group + pand mm1, mm6 // mask to use only 3rd active group add ebx, 8 paddb mm0, mm1 cmp ebx, MMXLength @@ -3359,13 +3359,13 @@ dsub1end: movq mm1, [edi+ebx-8] dsub4lp: psrlq mm1, ShiftRem // Shift data for adding 1st bpp bytes - // no need for tqmask; shift clears inactive bytes + // no need for mask; shift clears inactive bytes movq mm0, [edi+ebx] paddb mm0, mm1 // Add 2nd active group movq mm1, mm0 // mov updated Raws to mm1 psllq mm1, ShiftBpp // shift data to position correctly - // there is no need for any tqmask + // there is no need for any mask // since shift clears inactive bits/bytes add ebx, 8 paddb mm0, mm1 @@ -3387,36 +3387,36 @@ dsub4lp: mov ebx, diff movq mm6, mm7 mov edi, row - psllq mm6, ShiftBpp // Move tqmask in mm6 to cover 3rd active + psllq mm6, ShiftBpp // Move mask in mm6 to cover 3rd active // byte group mov esi, edi // lp = row movq mm5, mm6 add edi, bpp // rp = row + bpp - psllq mm5, ShiftBpp // Move tqmask in mm5 to cover 4th active + psllq mm5, ShiftBpp // Move mask in mm5 to cover 4th active // byte group // PRIME the pump (load the first Raw(x-bpp) data set movq mm1, [edi+ebx-8] dsub2lp: // Add 1st active group psrlq mm1, ShiftRem // Shift data for adding 1st bpp bytes - // no need for tqmask; shift clears inactive + // no need for mask; shift clears inactive // bytes movq mm0, [edi+ebx] paddb mm0, mm1 // Add 2nd active group movq mm1, mm0 // mov updated Raws to mm1 psllq mm1, ShiftBpp // shift data to position correctly - pand mm1, mm7 // tqmask to use only 2nd active group + pand mm1, mm7 // mask to use only 2nd active group paddb mm0, mm1 // Add 3rd active group movq mm1, mm0 // mov updated Raws to mm1 psllq mm1, ShiftBpp // shift data to position correctly - pand mm1, mm6 // tqmask to use only 3rd active group + pand mm1, mm6 // mask to use only 3rd active group paddb mm0, mm1 // Add 4th active group movq mm1, mm0 // mov updated Raws to mm1 psllq mm1, ShiftBpp // shift data to position correctly - pand mm1, mm5 // tqmask to use only 4th active group + pand mm1, mm5 // mask to use only 4th active group add ebx, 8 paddb mm0, mm1 cmp ebx, MMXLength diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngwrite.c b/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngwrite.c index a8a9365a9..eb84b9930 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngwrite.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngwrite.c @@ -866,7 +866,7 @@ png_write_row(png_structp png_ptr, png_bytep row) * 1. Libpng was compiled with PNG_MNG_FEATURES_SUPPORTED and * 2. Libpng did not write a PNG signature (this filter_method is only * used in PNG datastreams that are embedded in MNG datastreams) and - * 3. The application called png_permit_mng_features with a tqmask that + * 3. The application called png_permit_mng_features with a mask that * included PNG_FLAG_MNG_FILTER_64 and * 4. The filter_method is 64 and * 5. The color_type is RGB or RGBA 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); } } } diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngwutil.c b/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngwutil.c index edcf82863..d640179a7 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngwutil.c +++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/pngwutil.c @@ -427,7 +427,7 @@ png_write_IHDR(png_structp png_ptr, png_uint_32 width, png_uint_32 height, * 1. Libpng was compiled with PNG_MNG_FEATURES_SUPPORTED and * 2. Libpng did not write a PNG signature (this filter_method is only * used in PNG datastreams that are embedded in MNG datastreams) and - * 3. The application called png_permit_mng_features with a tqmask that + * 3. The application called png_permit_mng_features with a mask that * included PNG_FLAG_MNG_FILTER_64 and * 4. The filter_method is 64 and * 5. The color_type is RGB or RGBA @@ -1007,7 +1007,7 @@ png_write_tRNS(png_structp png_ptr, png_bytep trans, png_color_16p tran, { if (num_trans <= 0 || num_trans > (int)png_ptr->num_palette) { - png_warning(png_ptr,"Invalid number of transtqparent colors specified"); + png_warning(png_ptr,"Invalid number of transparent colors specified"); return; } /* write the chunk out as it is */ diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/projects/msvc/png32ms.def b/experimental/tqtinterface/qt4/src/3rdparty/libpng/projects/msvc/png32ms.def index ae6abdda5..c99537143 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/projects/msvc/png32ms.def +++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/projects/msvc/png32ms.def @@ -202,8 +202,8 @@ EXPORTS png_permit_mng_features @184 ; MMX support png_mmx_support @185 - png_get_mmx_flagtqmask @186 - png_get_asm_flagtqmask @187 + png_get_mmx_flagmask @186 + png_get_asm_flagmask @187 png_get_asm_flags @188 png_get_mmx_bitdepth_threshold @189 png_get_mmx_rowbytes_threshold @190 diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/scripts/pngdef.pas b/experimental/tqtinterface/qt4/src/3rdparty/libpng/scripts/pngdef.pas index 2ac50c872..6e2068317 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/scripts/pngdef.pas +++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/scripts/pngdef.pas @@ -513,7 +513,7 @@ procedure png_set_hIST(png_ptr: png_structp; info_ptr: png_infop; function png_set_interlace_handling(png_ptr: png_structp): int; stdcall; procedure png_set_invalid(png_ptr: png_structp; info_ptr:png_infop; - tqmask: int); + mask: int); stdcall; procedure png_set_invert_alpha(png_ptr: png_structp); stdcall; diff --git a/experimental/tqtinterface/qt4/src/3rdparty/libpng/scripts/pngos2.def b/experimental/tqtinterface/qt4/src/3rdparty/libpng/scripts/pngos2.def index 8d3c68cf5..3c4a3c8d9 100644 --- a/experimental/tqtinterface/qt4/src/3rdparty/libpng/scripts/pngos2.def +++ b/experimental/tqtinterface/qt4/src/3rdparty/libpng/scripts/pngos2.def @@ -188,8 +188,8 @@ EXPORTS png_mmx_support png_permit_empty_plte png_permit_mng_features - png_get_mmx_flagtqmask - png_get_asm_flagtqmask + png_get_mmx_flagmask + png_get_asm_flagmask png_get_asm_flags png_get_mmx_bitdepth_threshold png_get_mmx_rowbytes_threshold |