diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-14 22:33:41 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-14 22:33:41 -0600 |
| commit | 0f92dd542b65bc910caaf190b7c623aa5158c86a (patch) | |
| tree | 120ab7e08fa0ffc354ef58d100f79a33c92aa6e6 /src/3rdparty/libpng | |
| parent | d796c9dd933ab96ec83b9a634feedd5d32e1ba3f (diff) | |
| download | tqt3-0f92dd542b65bc910caaf190b7c623aa5158c86a.tar.gz tqt3-0f92dd542b65bc910caaf190b7c623aa5158c86a.zip | |
Fix native TQt3 accidental conversion to tquit
Diffstat (limited to 'src/3rdparty/libpng')
| -rw-r--r-- | src/3rdparty/libpng/png.h | 6 | ||||
| -rw-r--r-- | src/3rdparty/libpng/pngrtran.c | 4 | ||||
| -rw-r--r-- | src/3rdparty/libpng/scripts/pngdef.pas | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/3rdparty/libpng/png.h b/src/3rdparty/libpng/png.h index e983bc775..b48a86094 100644 --- a/src/3rdparty/libpng/png.h +++ b/src/3rdparty/libpng/png.h @@ -1609,14 +1609,14 @@ extern PNG_EXPORT(void,png_set_crc_action) PNGARG((png_structp png_ptr, /* Values for png_set_crc_action() to say how to handle CRC errors in * ancillary and critical chunks, and whether to use the data contained * therein. Note that it is impossible to "discard" data in a critical - * chunk. For versions prior to 0.90, the action was always error/tquit, + * chunk. For versions prior to 0.90, the action was always error/quit, * whereas in version 0.90 and later, the action for CRC errors in ancillary * chunks is warn/discard. These values should NOT be changed. * * value action:critical action:ancillary */ -#define PNG_CRC_DEFAULT 0 /* error/tquit warn/discard data */ -#define PNG_CRC_ERROR_QUIT 1 /* error/tquit error/tquit */ +#define PNG_CRC_DEFAULT 0 /* error/quit warn/discard data */ +#define PNG_CRC_ERROR_QUIT 1 /* error/quit error/quit */ #define PNG_CRC_WARN_DISCARD 2 /* (INVALID) warn/discard data */ #define PNG_CRC_WARN_USE 3 /* warn/use data warn/use data */ #define PNG_CRC_QUIET_USE 4 /* tquiet/use data tquiet/use data */ diff --git a/src/3rdparty/libpng/pngrtran.c b/src/3rdparty/libpng/pngrtran.c index 73b813326..4f002c806 100644 --- a/src/3rdparty/libpng/pngrtran.c +++ b/src/3rdparty/libpng/pngrtran.c @@ -37,7 +37,7 @@ png_set_crc_action(png_structp png_ptr, int crit_action, int ancil_action) break; case PNG_CRC_WARN_DISCARD: /* not a valid action for critical data */ png_warning(png_ptr, "Can't discard critical data on CRC error."); - case PNG_CRC_ERROR_QUIT: /* error/tquit */ + case PNG_CRC_ERROR_QUIT: /* error/quit */ case PNG_CRC_DEFAULT: default: png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK; @@ -57,7 +57,7 @@ png_set_crc_action(png_structp png_ptr, int crit_action, int ancil_action) png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_USE | PNG_FLAG_CRC_ANCILLARY_NOWARN; break; - case PNG_CRC_ERROR_QUIT: /* error/tquit */ + case PNG_CRC_ERROR_QUIT: /* error/quit */ png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK; png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_NOWARN; break; diff --git a/src/3rdparty/libpng/scripts/pngdef.pas b/src/3rdparty/libpng/scripts/pngdef.pas index 3aeb067d8..ecfb8feb3 100644 --- a/src/3rdparty/libpng/scripts/pngdef.pas +++ b/src/3rdparty/libpng/scripts/pngdef.pas @@ -200,14 +200,14 @@ const // Values for png_set_crc_action() to say how to handle CRC errors in // ancillary and critical chunks, and whether to use the data contained // therein. Note that it is impossible to "discard" data in a critical -// chunk. For versions prior to 0.90, the action was always error/tquit, +// chunk. For versions prior to 0.90, the action was always error/quit, // whereas in version 0.90 and later, the action for CRC errors in ancillary // chunks is warn/discard. These values should NOT be changed. // value action:critical action:ancillary - PNG_CRC_DEFAULT = 0; // error/tquit warn/discard data - PNG_CRC_ERROR_QUIT = 1; // error/tquit error/tquit + PNG_CRC_DEFAULT = 0; // error/quit warn/discard data + PNG_CRC_ERROR_QUIT = 1; // error/quit error/quit PNG_CRC_WARN_DISCARD = 2; // (INVALID) warn/discard data PNG_CRC_WARN_USE = 3; // warn/use data warn/use data PNG_CRC_QUIET_USE = 4; // tquiet/use data tquiet/use data |