diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-05-07 21:58:34 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-05-07 21:58:34 -0500 |
| commit | c740211ffba3330d951f4c3ddefea8edf23a01cd (patch) | |
| tree | 0a8b7641d3c5b576d18a2f7912c75fc600f494e2 /src/3rdparty | |
| parent | 8a4eacb6185de3653f6ae401c352aef833a9e72a (diff) | |
| download | tqt3-c740211ffba3330d951f4c3ddefea8edf23a01cd.tar.gz tqt3-c740211ffba3330d951f4c3ddefea8edf23a01cd.zip | |
Automated update from Qt3
Diffstat (limited to 'src/3rdparty')
39 files changed, 206 insertions, 206 deletions
diff --git a/src/3rdparty/libmng/README.autoconf b/src/3rdparty/libmng/README.autoconf index ba4282ede..e52d84b5c 100644 --- a/src/3rdparty/libmng/README.autoconf +++ b/src/3rdparty/libmng/README.autoconf @@ -177,7 +177,7 @@ operates. `--help' Print a summary of the options to `configure', and exit. -`--tquiet' +`--quiet' `--silent' `-q' Do not print messages saying which checks are being made. To diff --git a/src/3rdparty/libmng/aclocal.m4 b/src/3rdparty/libmng/aclocal.m4 index 151990228..e94a29abf 100644 --- a/src/3rdparty/libmng/aclocal.m4 +++ b/src/3rdparty/libmng/aclocal.m4 @@ -557,7 +557,7 @@ EOF # Now try to grab the symbols. nlist=conftest.nm if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then - # Try sorting and unitquifying the output. + # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" else @@ -1996,7 +1996,7 @@ else solaris*) # gcc --version < 3.0 without binutils cannot create self contained - # shared libraries reliably, retquiring libgcc.a to resolve some of + # shared libraries reliably, requiring libgcc.a to resolve some of # the object symbols generated in some cases. Libraries that use # assert need libgcc.a to resolve __eprintf, for example. Linking # a copy of libgcc.a into every shared library to guarantee resolving diff --git a/src/3rdparty/libmng/configure b/src/3rdparty/libmng/configure index 9725a7233..b204ca02e 100755 --- a/src/3rdparty/libmng/configure +++ b/src/3rdparty/libmng/configure @@ -332,7 +332,7 @@ Configuration: --cache-file=FILE cache test results in FILE --help print this message --no-create do not create output files - --tquiet, --silent do not print \`checking...' messages + --quiet, --silent do not print \`checking...' messages --version print the version of autoconf that created configure Directory and file names: --prefix=PREFIX install architecture-independent files in PREFIX @@ -477,7 +477,7 @@ EOF | --progr-tra=* | --program-tr=* | --program-t=*) program_transform_name="$ac_optarg" ;; - -q | -tquiet | --tquiet | --tquie | --tqui | --qu | --q \ + -q | -quiet | --quiet | --tquie | --tqui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; @@ -2247,7 +2247,7 @@ EOF # Now try to grab the symbols. nlist=conftest.nm if { (eval echo configure:2250: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then - # Try sorting and unitquifying the output. + # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" else @@ -3822,7 +3822,7 @@ else solaris*) # gcc --version < 3.0 without binutils cannot create self contained - # shared libraries reliably, retquiring libgcc.a to resolve some of + # shared libraries reliably, requiring libgcc.a to resolve some of # the object symbols generated in some cases. Libraries that use # assert need libgcc.a to resolve __eprintf, for example. Linking # a copy of libgcc.a into every shared library to guarantee resolving diff --git a/src/3rdparty/libmng/doc/libmng.txt b/src/3rdparty/libmng/doc/libmng.txt index a18940bbe..9c76be537 100644 --- a/src/3rdparty/libmng/doc/libmng.txt +++ b/src/3rdparty/libmng/doc/libmng.txt @@ -829,7 +829,7 @@ callback! This method is preferred if you are reading from a slow input device (such as a dialup-line) and you wish to start displaying something -as tquickly as possible. This functionality is provided mainly for +as quickly as possible. This functionality is provided mainly for browser-type applications but may be appropriate for other applications as well. diff --git a/src/3rdparty/libmng/doc/man/libmng.3 b/src/3rdparty/libmng/doc/man/libmng.3 index bdc474577..54d6ad34d 100644 --- a/src/3rdparty/libmng/doc/man/libmng.3 +++ b/src/3rdparty/libmng/doc/man/libmng.3 @@ -847,7 +847,7 @@ callback! This method is preferred if you are reading from a slow input device (such as a dialup-line) and you wish to start displaying something -as tquickly as possible. This functionality is provided mainly for +as quickly as possible. This functionality is provided mainly for browser-type applications but may be appropriate for other applications as well. diff --git a/src/3rdparty/libmng/libmng.h b/src/3rdparty/libmng/libmng.h index f9e7d525a..924f40dbf 100644 --- a/src/3rdparty/libmng/libmng.h +++ b/src/3rdparty/libmng/libmng.h @@ -2096,7 +2096,7 @@ MNG_EXT mng_retcode MNG_DECL mng_updatemngsimplicity (mng_handle hHandle, #define MNG_INVALIDSIG (mng_retcode)1025 /* invalid graphics file */ #define MNG_INVALIDCRC (mng_retcode)1027 /* crc check failed */ #define MNG_INVALIDLENGTH (mng_retcode)1028 /* chunklength mystifies me */ -#define MNG_SETQUENCEERROR (mng_retcode)1029 /* invalid chunk sequence */ +#define MNG_SEQUENCEERROR (mng_retcode)1029 /* invalid chunk sequence */ #define MNG_CHUNKNOTALLOWED (mng_retcode)1030 /* completely out-of-place */ #define MNG_MULTIPLEERROR (mng_retcode)1031 /* only one occurence allowed */ #define MNG_PLTEMISSING (mng_retcode)1032 /* indexed-color requires PLTE */ @@ -2461,7 +2461,7 @@ MNG_EXT mng_retcode MNG_DECL mng_updatemngsimplicity (mng_handle hHandle, #define MNG_COMPRESSION_BASELINEJPEG 8 /* JHDR */ -#define MNG_INTERLACE_SETQUENTIAL 0 /* JHDR */ +#define MNG_INTERLACE_SEQUENTIAL 0 /* JHDR */ #define MNG_INTERLACE_PROGRESSIVE 8 #endif /* MNG_INCLUDE_JNG */ diff --git a/src/3rdparty/libmng/libmng_chunk_io.c b/src/3rdparty/libmng/libmng_chunk_io.c index f16ef91d9..0f61a708e 100644 --- a/src/3rdparty/libmng/libmng_chunk_io.c +++ b/src/3rdparty/libmng/libmng_chunk_io.c @@ -559,14 +559,14 @@ READ_CHUNK (read_ihdr) MNG_ERROR (pData, MNG_CHUNKNOTALLOWED) /* sequence checks */ if ((pData->eSigtype == mng_it_png) && (pData->iChunkseq > 1)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasIDAT) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasIDAT)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) pData->bHasIHDR = MNG_TRUE; /* indicate IHDR is present */ /* and store interesting fields */ @@ -711,14 +711,14 @@ READ_CHUNK (read_plte) /* sequence checks */ if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIDAT) || (pData->bHasJHDR)) #else if (pData->bHasIDAT) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* multiple PLTE only inside BASI */ if ((pData->bHasPLTE) && (!pData->bHasBASI)) MNG_ERROR (pData, MNG_MULTIPLEERROR) @@ -884,15 +884,15 @@ READ_CHUNK (read_idat) #else if ((!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasJHDR) && (pData->iJHDRalphacompression != MNG_COMPRESSION_DEFLATE)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (pData->bHasJSEP) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #endif /* not allowed for for deltatype NO_CHANGE */ if ((pData->bHasDHDR) && ((pData->iDeltatype == MNG_DELTATYPE_NOCHANGE))) @@ -958,7 +958,7 @@ READ_CHUNK (read_iend) #else if ((!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* IHDR-block requires IDAT */ if ((pData->bHasIHDR) && (!pData->bHasIDAT)) MNG_ERROR (pData, MNG_IDATMISSING) @@ -1032,14 +1032,14 @@ READ_CHUNK (read_trns) /* sequence checks */ if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIDAT) || (pData->bHasJHDR)) #else if (pData->bHasIDAT) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* multiple tRNS only inside BASI */ if ((pData->bHasTRNS) && (!pData->bHasBASI)) MNG_ERROR (pData, MNG_MULTIPLEERROR) @@ -1280,14 +1280,14 @@ READ_CHUNK (read_gama) if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIDAT) || (pData->bHasPLTE) || (pData->bHasJDAT) || (pData->bHasJDAA)) #else if ((pData->bHasIDAT) || (pData->bHasPLTE)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) @@ -1393,14 +1393,14 @@ READ_CHUNK (read_chrm) if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIDAT) || (pData->bHasPLTE) || (pData->bHasJDAT) || (pData->bHasJDAA)) #else if ((pData->bHasIDAT) || (pData->bHasPLTE)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) @@ -1561,14 +1561,14 @@ READ_CHUNK (read_srgb) if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIDAT) || (pData->bHasPLTE) || (pData->bHasJDAT) || (pData->bHasJDAA)) #else if ((pData->bHasIDAT) || (pData->bHasPLTE)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) @@ -1681,14 +1681,14 @@ READ_CHUNK (read_iccp) if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIDAT) || (pData->bHasPLTE) || (pData->bHasJDAT) || (pData->bHasJDAA)) #else if ((pData->bHasIDAT) || (pData->bHasPLTE)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) @@ -1904,7 +1904,7 @@ READ_CHUNK (read_text) if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen < 2) /* length must be at least 2 */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -2003,7 +2003,7 @@ READ_CHUNK (read_ztxt) if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen < 3) /* length must be at least 3 */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -2145,7 +2145,7 @@ READ_CHUNK (read_itxt) if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen < 6) /* length must be at least 6 */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -2174,7 +2174,7 @@ READ_CHUNK (read_itxt) iCompressedsize = (mng_uint32)(iRawlen - iKeywordlen - iLanguagelen - iTranslationlen - 5); iCompressionflag = *(pNull1+1); - zKeyword = 0; /* no buffers actquired yet */ + zKeyword = 0; /* no buffers acquired yet */ zLanguage = 0; zTranslation = 0; pBuf = 0; @@ -2348,14 +2348,14 @@ READ_CHUNK (read_bkgd) if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIDAT) || (pData->bHasJDAT) || (pData->bHasJDAA)) #else if (pData->bHasIDAT) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen > 6) /* it just can't be bigger than that! */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -2529,14 +2529,14 @@ READ_CHUNK (read_phys) if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIDAT) || (pData->bHasJDAT) || (pData->bHasJDAA)) #else if (pData->bHasIDAT) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* it's 9 bytes or empty; no more, no less! */ if ((iRawlen != 9) && (iRawlen != 0)) MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -2592,14 +2592,14 @@ READ_CHUNK (read_sbit) if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasPLTE) || (pData->bHasIDAT) || (pData->bHasJDAT) || (pData->bHasJDAA)) #else if ((pData->bHasPLTE) || (pData->bHasIDAT)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen > 4) /* it just can't be bigger than that! */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -2711,10 +2711,10 @@ READ_CHUNK (read_splt) /* sequence checks */ if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (pData->bHasIDAT) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen) { @@ -2804,10 +2804,10 @@ READ_CHUNK (read_hist) #endif /* sequence checks */ if ((!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if ((!pData->bHasPLTE) || (pData->bHasIDAT)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* length oke ? */ if ( ((iRawlen & 0x01) != 0) || ((iRawlen >> 1) != pData->iPLTEcount) ) MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -2864,7 +2864,7 @@ READ_CHUNK (read_time) if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen != 7) /* length must be exactly 7 */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -2911,7 +2911,7 @@ READ_CHUNK (read_mhdr) MNG_ERROR (pData, MNG_CHUNKNOTALLOWED) if (pData->bHasheader) /* can only be the first chunk! */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* correct length ? */ if ((iRawlen != 28) && (iRawlen != 12)) MNG_ERROR (pData, MNG_INVALIDLENGTH); @@ -3003,7 +3003,7 @@ READ_CHUNK (read_mend) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen > 0) /* must not contain data! */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -3045,7 +3045,7 @@ READ_CHUNK (read_loop) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (!pData->bCacheplayback) /* must store playback info to work!! */ MNG_ERROR (pData, MNG_LOOPWITHCACHEOFF) @@ -3055,7 +3055,7 @@ READ_CHUNK (read_loop) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen >= 5) /* length checks */ { @@ -3199,14 +3199,14 @@ READ_CHUNK (read_endl) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen != 1) /* length must be exactly 1 */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -3268,14 +3268,14 @@ READ_CHUNK (read_defi) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* check the length */ if ((iRawlen != 2) && (iRawlen != 3) && (iRawlen != 4) && (iRawlen != 12) && (iRawlen != 28)) @@ -3415,14 +3415,14 @@ READ_CHUNK (read_basi) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* check the length */ if ((iRawlen != 13) && (iRawlen != 19) && (iRawlen != 21) && (iRawlen != 22)) MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -3559,14 +3559,14 @@ READ_CHUNK (read_clon) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* check the length */ if ((iRawlen != 4) && (iRawlen != 5) && (iRawlen != 6) && (iRawlen != 7) && (iRawlen != 16)) @@ -3677,14 +3677,14 @@ READ_CHUNK (read_past) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* check the length */ if ((iRawlen < 41) || (((iRawlen - 11) % 30) != 0)) @@ -3763,14 +3763,14 @@ READ_CHUNK (read_disc) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if ((iRawlen % 2) != 0) /* check the length */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -3832,14 +3832,14 @@ READ_CHUNK (read_back) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* check the length */ if ((iRawlen != 6) && (iRawlen != 7) && (iRawlen != 9) && (iRawlen != 10)) MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -3924,14 +3924,14 @@ READ_CHUNK (read_fram) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen <= 1) /* only framing-mode ? */ { @@ -4175,14 +4175,14 @@ READ_CHUNK (read_move) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen != 13) /* check the length */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -4243,14 +4243,14 @@ READ_CHUNK (read_clip) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen != 21) /* check the length */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -4317,14 +4317,14 @@ READ_CHUNK (read_show) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* check the length */ if ((iRawlen != 0) && (iRawlen != 2) && (iRawlen != 4) && (iRawlen != 5)) MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -4410,17 +4410,17 @@ READ_CHUNK (read_term) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (pData->bHasLOOP) /* no way, jose! */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (pData->bHasTERM) /* only 1 allowed! */ MNG_ERROR (pData, MNG_MULTIPLEERROR) @@ -4490,14 +4490,14 @@ READ_CHUNK (read_save) #endif /* sequence checks */ if ((!pData->bHasMHDR) || (pData->bHasSAVE)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) pData->bHasSAVE = MNG_TRUE; @@ -4701,14 +4701,14 @@ READ_CHUNK (read_seek) #endif /* sequence checks */ if ((!pData->bHasMHDR) || (!pData->bHasSAVE)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (pData->fProcessseek) /* inform the app ? */ { @@ -4782,14 +4782,14 @@ READ_CHUNK (read_expi) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen < 3) /* check the length */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -4841,14 +4841,14 @@ READ_CHUNK (read_fpri) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen != 2) /* must be two bytes long */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -5022,14 +5022,14 @@ READ_CHUNK (read_need) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen < 1) /* check the length */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -5097,14 +5097,14 @@ READ_CHUNK (read_phyg) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* it's 9 bytes or empty; no more, no less! */ if ((iRawlen != 9) && (iRawlen != 0)) MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -5158,10 +5158,10 @@ READ_CHUNK (read_jhdr) MNG_ERROR (pData, MNG_CHUNKNOTALLOWED) if ((pData->eSigtype == mng_it_jng) && (pData->iChunkseq > 1)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen != 16) /* length oke ? */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -5193,7 +5193,7 @@ READ_CHUNK (read_jhdr) if (pData->iJHDRimgcompression != MNG_COMPRESSION_BASELINEJPEG) MNG_ERROR (pData, MNG_INVALIDCOMPRESS) - if ((pData->iJHDRimginterlace != MNG_INTERLACE_SETQUENTIAL ) && + if ((pData->iJHDRimginterlace != MNG_INTERLACE_SEQUENTIAL ) && (pData->iJHDRimginterlace != MNG_INTERLACE_PROGRESSIVE) ) MNG_ERROR (pData, MNG_INVALIDINTERLACE) @@ -5314,13 +5314,13 @@ READ_CHUNK (read_jdaa) #endif /* sequence checks */ if ((!pData->bHasJHDR) && (!pData->bHasDHDR)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (pData->bHasJSEP) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (pData->iJHDRalphacompression != MNG_COMPRESSION_BASELINEJPEG) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen == 0) /* can never be empty */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -5376,7 +5376,7 @@ READ_CHUNK (read_jdat) #endif /* sequence checks */ if ((!pData->bHasJHDR) && (!pData->bHasDHDR)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen == 0) /* can never be empty */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -5432,7 +5432,7 @@ READ_CHUNK (read_jsep) #endif if (!pData->bHasJHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen != 0) /* must be empty ! */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -5470,14 +5470,14 @@ READ_CHUNK (read_dhdr) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* check for valid length */ if ((iRawlen != 4) && (iRawlen != 12) && (iRawlen != 20)) MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -5581,7 +5581,7 @@ READ_CHUNK (read_prom) #endif /* sequence checks */ if ((!pData->bHasMHDR) || (!pData->bHasDHDR)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen != 3) /* gotta be exactly 3 bytes */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -5652,7 +5652,7 @@ READ_CHUNK (read_ipng) #endif /* sequence checks */ if ((!pData->bHasMHDR) || (!pData->bHasDHDR)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen != 0) /* gotta be empty */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -5706,7 +5706,7 @@ READ_CHUNK (read_pplt) #endif /* sequence checks */ if ((!pData->bHasMHDR) && (!pData->bHasDHDR)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen < 1) /* must have at least 1 byte */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -5880,7 +5880,7 @@ READ_CHUNK (read_ijng) #endif /* sequence checks */ if ((!pData->bHasMHDR) || (!pData->bHasDHDR)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen != 0) /* gotta be empty */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -5924,7 +5924,7 @@ READ_CHUNK (read_drop) #endif /* sequence checks */ if ((!pData->bHasMHDR) || (!pData->bHasDHDR)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* check length */ if ((iRawlen < 4) || ((iRawlen % 4) != 0)) MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -5986,7 +5986,7 @@ READ_CHUNK (read_dbyk) #endif /* sequence checks */ if ((!pData->bHasMHDR) || (!pData->bHasDHDR)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen < 6) /* must be at least 6 long */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -6037,7 +6037,7 @@ READ_CHUNK (read_ordr) #endif /* sequence checks */ if ((!pData->bHasMHDR) || (!pData->bHasDHDR)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* check length */ if ((iRawlen < 5) || ((iRawlen % 5) != 0)) MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -6108,7 +6108,7 @@ READ_CHUNK (read_magn) #else if ((!pData->bHasMHDR) || (pData->bHasIHDR) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* check length */ if ((iRawlen > 20) || ((iRawlen & 0x01) != 0)) MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -6226,7 +6226,7 @@ READ_CHUNK (read_unknown) if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* critical chunk ? */ if (((mng_uint32)pData->iChunkname & 0x20000000) == 0) MNG_ERROR (pData, MNG_UNKNOWNCRITICAL) diff --git a/src/3rdparty/libmng/libmng_error.c b/src/3rdparty/libmng/libmng_error.c index b3e421803..237f4671f 100644 --- a/src/3rdparty/libmng/libmng_error.c +++ b/src/3rdparty/libmng/libmng_error.c @@ -102,7 +102,7 @@ {MNG_INVALIDSIG, "The signature is invalid"}, {MNG_INVALIDCRC, "The CRC for this chunk is invalid"}, {MNG_INVALIDLENGTH, "Chunk-length is invalid"}, - {MNG_SETQUENCEERROR, "Chunk out of sequence"}, + {MNG_SEQUENCEERROR, "Chunk out of sequence"}, {MNG_CHUNKNOTALLOWED, "Chunk not allowed at this point"}, {MNG_MULTIPLEERROR, "Chunk cannot occur multiple times"}, {MNG_PLTEMISSING, "Missing PLTE chunk"}, diff --git a/src/3rdparty/libmng/ltmain.sh b/src/3rdparty/libmng/ltmain.sh index 59b9650b0..7b739c807 100644 --- a/src/3rdparty/libmng/ltmain.sh +++ b/src/3rdparty/libmng/ltmain.sh @@ -177,7 +177,7 @@ do --mode) prevopt="--mode" prev=mode ;; --mode=*) mode="$optarg" ;; - --tquiet | --silent) + --quiet | --silent) show=: ;; @@ -263,7 +263,7 @@ if test -z "$show_help"; then generic_help="$help" help="Try \`$modename --help --mode=$mode' for more information." - # These modes are in order of execution frequency so that they run tquickly. + # These modes are in order of execution frequency so that they run quickly. case $mode in # libtool compile mode compile) @@ -3305,7 +3305,7 @@ extern \"C\" { $mv "$nlist"T "$nlist" fi - # Try sorting and unitquifying the output. + # Try sorting and uniquifying the output. if grep -v "^: " < "$nlist" | sort +2 | uniq > "$nlist"S; then : else @@ -4805,7 +4805,7 @@ Provide generalized library-building support services. --finish same as \`--mode=finish' --help display this help message and exit --mode=MODE use operation mode MODE [default=inferred from MODE-ARGS] - --tquiet same as \`--silent' + --quiet same as \`--silent' --silent don't print informational messages --version print version information diff --git a/src/3rdparty/libpng/CHANGES b/src/3rdparty/libpng/CHANGES index 65d047b18..d151a41c7 100644 --- a/src/3rdparty/libpng/CHANGES +++ b/src/3rdparty/libpng/CHANGES @@ -167,7 +167,7 @@ version 0.96 [May, 1997] fixed DOS medium model support (Tim Wegner) fixed png_check_keyword() for case with error in static string text added read of CRC after IEND chunk for embedded PNGs (Laszlo Nyul) - added typecasts to tquiet compiler errors + added typecasts to quiet compiler errors added more debugging info version 0.97 [January, 1998] removed PNG_USE_OWN_CRC capability @@ -935,7 +935,7 @@ version 1.0.11 [April 27, 2001] version 1.0.12beta1 [May 14, 2001] Test for Windows platform in pngconf.h when including malloc.h (Emmanuel Blot) Updated makefile.cygwin and handling of Cygwin's ALL_STATIC in pngconf.h - Added some never-to-be-executed code in pnggccrd.c to tquiet compiler warnings. + Added some never-to-be-executed code in pnggccrd.c to quiet compiler warnings. Eliminated the png_error about apps using png_read|write_init(). Instead, libpng will reallocate the png_struct and info_struct if they are too small. This retains future binary compatibility for old applications written for @@ -1055,7 +1055,7 @@ version 1.2.2beta5 [March 26, 2002] Revised makefiles to make symlink to libpng.so.NN in addition to libpngNN.so version 1.2.2beta6 [March 31, 2002] version 1.0.13beta1 [March 31, 2002] - Prevent png_zalloc() from trying to memset memory that it failed to actquire. + Prevent png_zalloc() from trying to memset memory that it failed to acquire. Add typecasts of PNG_MAX_UINT in pngset_cHRM_fixed() (Matt Holgate). Ensure that the right function (user or default) is used to free the png_struct after an error in png_create_read_struct_2(). diff --git a/src/3rdparty/libpng/INSTALL b/src/3rdparty/libpng/INSTALL index d407c9e43..1d6dfc5f0 100644 --- a/src/3rdparty/libpng/INSTALL +++ b/src/3rdparty/libpng/INSTALL @@ -132,7 +132,7 @@ Then read pngconf.h to see if you want to make any configuration changes. Then just run "make test" which will create the libpng library in -this directory and run a tquick test that reads the "pngtest.png" +this directory and run a quick test that reads the "pngtest.png" file and writes a "pngout.png" file that should be identical to it. Look for "9782 zero samples" in the output of the test. For more confidence, you can run another test by typing "pngtest pngnow.png" diff --git a/src/3rdparty/libpng/libpng.3 b/src/3rdparty/libpng/libpng.3 index 249fc0959..b54b54799 100644 --- a/src/3rdparty/libpng/libpng.3 +++ b/src/3rdparty/libpng/libpng.3 @@ -957,7 +957,7 @@ pointers to error handling functions, and a pointer to a data struct for use by the error functions, if necessary (the pointer and functions can be NULL if the default error handlers are to be used). See the section on Changes to Libpng below regarding the old initialization functions. -The structure allocation functions tquietly return NULL if they fail to +The structure allocation functions quietly return NULL if they fail to create the structure, so your application should check for that. png_structp png_ptr = png_create_read_struct @@ -1470,7 +1470,7 @@ rowbytes, as some of the transformations could increase the space needed to hold a row (expand, filler, gray_to_rgb, etc.). See png_read_update_info(), below. -A tquick word about text_ptr and num_text. PNG stores comments in +A quick word about text_ptr and num_text. PNG stores comments in keyword/text pairs, one pair per chunk, with no limit on the number of text chunks, and a 2^31 byte limit on their size. While there are suggested keywords, there is no requirement to restrict the use to these @@ -2626,7 +2626,7 @@ structure (that is, the value of "i", which is the order in which the chunk was either read from the input file or defined with png_set_unknown_chunks). -A tquick word about text and num_text. text is an array of png_text +A quick word about text and num_text. text is an array of png_text structures. num_text is the number of valid structures in the array. Each png_text structure holds a language code, a keyword, a text value, and a compression type. @@ -3200,7 +3200,7 @@ library code itself needs to know about interactions between your chunk and existing `intrinsic' chunks. If you need to write a new intrinsic chunk, first read the PNG -specification. Actquire a first level of +specification. Acquire a first level of understanding of how it works. Pay particular attention to the sections that describe chunk names, and look at how other chunks were designed, so you can do things similarly. Second, check out the diff --git a/src/3rdparty/libpng/libpng.txt b/src/3rdparty/libpng/libpng.txt index c0892e508..689b56481 100644 --- a/src/3rdparty/libpng/libpng.txt +++ b/src/3rdparty/libpng/libpng.txt @@ -166,7 +166,7 @@ pointers to error handling functions, and a pointer to a data struct for use by the error functions, if necessary (the pointer and functions can be NULL if the default error handlers are to be used). See the section on Changes to Libpng below regarding the old initialization functions. -The structure allocation functions tquietly return NULL if they fail to +The structure allocation functions quietly return NULL if they fail to create the structure, so your application should check for that. png_structp png_ptr = png_create_read_struct @@ -679,7 +679,7 @@ rowbytes, as some of the transformations could increase the space needed to hold a row (expand, filler, gray_to_rgb, etc.). See png_read_update_info(), below. -A tquick word about text_ptr and num_text. PNG stores comments in +A quick word about text_ptr and num_text. PNG stores comments in keyword/text pairs, one pair per chunk, with no limit on the number of text chunks, and a 2^31 byte limit on their size. While there are suggested keywords, there is no requirement to restrict the use to these @@ -1835,7 +1835,7 @@ structure (that is, the value of "i", which is the order in which the chunk was either read from the input file or defined with png_set_unknown_chunks). -A tquick word about text and num_text. text is an array of png_text +A quick word about text and num_text. text is an array of png_text structures. num_text is the number of valid structures in the array. Each png_text structure holds a language code, a keyword, a text value, and a compression type. @@ -2409,7 +2409,7 @@ library code itself needs to know about interactions between your chunk and existing `intrinsic' chunks. If you need to write a new intrinsic chunk, first read the PNG -specification. Actquire a first level of +specification. Acquire a first level of understanding of how it works. Pay particular attention to the sections that describe chunk names, and look at how other chunks were designed, so you can do things similarly. Second, check out the diff --git a/src/3rdparty/libpng/png.h b/src/3rdparty/libpng/png.h index 98390e263..55f9b650d 100644 --- a/src/3rdparty/libpng/png.h +++ b/src/3rdparty/libpng/png.h @@ -746,7 +746,7 @@ defined(PNG_READ_BACKGROUND_SUPPORTED) * The integer range [0, 2^bit_depth - 1] maps to the floating-point * range given by [pcal_X0, pcal_X1], and are further transformed by a * (possibly non-linear) transformation function given by "pcal_type" - * and "pcal_params" into "pcal_units". Please see the PNG_ETQUATION_ + * and "pcal_params" into "pcal_units". Please see the PNG_EQUATION_ * defines below, and the PNG-Group's PNG extensions document for a * complete description of the transformations and how they should be * implemented, and for a description of the ASCII parameter strings. @@ -757,7 +757,7 @@ defined(PNG_READ_BACKGROUND_SUPPORTED) png_int_32 pcal_X1; /* maximum value */ png_charp pcal_units; /* Latin-1 string giving physical units */ png_charpp pcal_params; /* ASCII strings containing parameter values */ - png_byte pcal_type; /* equation type (see PNG_ETQUATION_ below) */ + png_byte pcal_type; /* equation type (see PNG_EQUATION_ below) */ png_byte pcal_nparams; /* number of parameters given in pcal_params */ #endif @@ -875,11 +875,11 @@ typedef png_info FAR * FAR * png_infopp; #define PNG_OFFSET_LAST 2 /* Not a valid value */ /* These are for the pCAL chunk. These values should NOT be changed. */ -#define PNG_ETQUATION_LINEAR 0 /* Linear transformation */ -#define PNG_ETQUATION_BASE_E 1 /* Exponential base e transform */ -#define PNG_ETQUATION_ARBITRARY 2 /* Arbitrary base exponential transform */ -#define PNG_ETQUATION_HYPERBOLIC 3 /* Hyperbolic sine transformation */ -#define PNG_ETQUATION_LAST 4 /* Not a valid value */ +#define PNG_EQUATION_LINEAR 0 /* Linear transformation */ +#define PNG_EQUATION_BASE_E 1 /* Exponential base e transform */ +#define PNG_EQUATION_ARBITRARY 2 /* Arbitrary base exponential transform */ +#define PNG_EQUATION_HYPERBOLIC 3 /* Hyperbolic sine transformation */ +#define PNG_EQUATION_LAST 4 /* Not a valid value */ /* These are for the sCAL chunk. These values should NOT be changed. */ #define PNG_SCALE_UNKNOWN 0 /* unknown unit (image scale) */ @@ -1505,7 +1505,7 @@ extern PNG_EXPORT(void,png_set_background) PNGARG((png_structp png_ptr, #define PNG_BACKGROUND_GAMMA_UNKNOWN 0 #define PNG_BACKGROUND_GAMMA_SCREEN 1 #define PNG_BACKGROUND_GAMMA_FILE 2 -#define PNG_BACKGROUND_GAMMA_UNITQUE 3 +#define PNG_BACKGROUND_GAMMA_UNIQUE 3 #endif #if defined(PNG_READ_16_TO_8_SUPPORTED) @@ -1619,7 +1619,7 @@ extern PNG_EXPORT(void,png_set_crc_action) PNGARG((png_structp png_ptr, #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 */ +#define PNG_CRC_QUIET_USE 4 /* quiet/use data quiet/use data */ #define PNG_CRC_NO_CHANGE 5 /* use current value use current value */ /* These functions give the user control over the scan-line filtering in diff --git a/src/3rdparty/libpng/pngpread.c b/src/3rdparty/libpng/pngpread.c index 5da819b4a..36701f627 100644 --- a/src/3rdparty/libpng/pngpread.c +++ b/src/3rdparty/libpng/pngpread.c @@ -1031,7 +1031,7 @@ png_push_handle_tEXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND)) { png_error(png_ptr, "Out of place tEXt"); - /* to tquiet some compiler warnings */ + /* to quiet some compiler warnings */ if(info_ptr == NULL) return; } @@ -1127,7 +1127,7 @@ png_push_handle_zTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND)) { png_error(png_ptr, "Out of place zTXt"); - /* to tquiet some compiler warnings */ + /* to quiet some compiler warnings */ if(info_ptr == NULL) return; } @@ -1319,7 +1319,7 @@ png_push_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND)) { png_error(png_ptr, "Out of place iTXt"); - /* to tquiet some compiler warnings */ + /* to quiet some compiler warnings */ if(info_ptr == NULL) return; } @@ -1446,7 +1446,7 @@ png_push_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 #endif png_chunk_error(png_ptr, "unknown critical chunk"); - /* to tquiet compiler warnings about unused info_ptr */ + /* to quiet compiler warnings about unused info_ptr */ if (info_ptr == NULL) return; } diff --git a/src/3rdparty/libpng/pngread.c b/src/3rdparty/libpng/pngread.c index 269a6be0d..80d0ba042 100644 --- a/src/3rdparty/libpng/pngread.c +++ b/src/3rdparty/libpng/pngread.c @@ -1412,7 +1412,7 @@ png_read_png(png_structp png_ptr, png_infop info_ptr, png_read_end(png_ptr, info_ptr); if(transforms == 0 || params == NULL) - /* tquiet compiler warnings */ return; + /* quiet compiler warnings */ return; } #endif diff --git a/src/3rdparty/libpng/pngrtran.c b/src/3rdparty/libpng/pngrtran.c index 4f002c806..a0a3994d7 100644 --- a/src/3rdparty/libpng/pngrtran.c +++ b/src/3rdparty/libpng/pngrtran.c @@ -30,7 +30,7 @@ png_set_crc_action(png_structp png_ptr, int crit_action, int ancil_action) png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK; png_ptr->flags |= PNG_FLAG_CRC_CRITICAL_USE; break; - case PNG_CRC_QUIET_USE: /* tquiet/use data */ + case PNG_CRC_QUIET_USE: /* quiet/use data */ png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK; png_ptr->flags |= PNG_FLAG_CRC_CRITICAL_USE | PNG_FLAG_CRC_CRITICAL_IGNORE; @@ -52,7 +52,7 @@ png_set_crc_action(png_structp png_ptr, int crit_action, int ancil_action) png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK; png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_USE; break; - case PNG_CRC_QUIET_USE: /* tquiet/use data */ + case PNG_CRC_QUIET_USE: /* quiet/use data */ png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK; png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_USE | PNG_FLAG_CRC_ANCILLARY_NOWARN; @@ -281,7 +281,7 @@ png_set_dither(png_structp png_ptr, png_colorp palette, } else { - /* This is much harder to do simply (and tquickly). Perhaps + /* This is much harder to do simply (and quickly). Perhaps we need to go through a median cut routine, but those don't always behave themselves with only a few colors as input. So we will just find the closest two colors, @@ -813,7 +813,7 @@ png_init_read_transformations(png_structp png_ptr) g = 1.0 / (png_ptr->gamma); gs = 1.0 / (png_ptr->gamma * png_ptr->screen_gamma); break; - case PNG_BACKGROUND_GAMMA_UNITQUE: + case PNG_BACKGROUND_GAMMA_UNIQUE: g = 1.0 / (png_ptr->background_gamma); gs = 1.0 / (png_ptr->background_gamma * png_ptr->screen_gamma); @@ -897,7 +897,7 @@ png_init_read_transformations(png_structp png_ptr) g = 1.0 / (png_ptr->gamma); gs = 1.0 / (png_ptr->gamma * png_ptr->screen_gamma); break; - case PNG_BACKGROUND_GAMMA_UNITQUE: + case PNG_BACKGROUND_GAMMA_UNIQUE: g = 1.0 / (png_ptr->background_gamma); gs = 1.0 / (png_ptr->background_gamma * png_ptr->screen_gamma); diff --git a/src/3rdparty/libpng/pngrutil.c b/src/3rdparty/libpng/pngrutil.c index 798abd2fc..13e085232 100644 --- a/src/3rdparty/libpng/pngrutil.c +++ b/src/3rdparty/libpng/pngrutil.c @@ -551,7 +551,7 @@ png_handle_IEND(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) { png_error(png_ptr, "No image in file"); - info_ptr = info_ptr; /* tquiet compiler warnings about unused info_ptr */ + info_ptr = info_ptr; /* quiet compiler warnings about unused info_ptr */ } png_ptr->mode |= (PNG_AFTER_IDAT | PNG_HAVE_IEND); @@ -1624,16 +1624,16 @@ png_handle_pCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) png_debug(3, "Checking pCAL equation type and number of parameters\n"); /* Check that we have the right number of parameters for known equation types. */ - if ((type == PNG_ETQUATION_LINEAR && nparams != 2) || - (type == PNG_ETQUATION_BASE_E && nparams != 3) || - (type == PNG_ETQUATION_ARBITRARY && nparams != 3) || - (type == PNG_ETQUATION_HYPERBOLIC && nparams != 4)) + if ((type == PNG_EQUATION_LINEAR && nparams != 2) || + (type == PNG_EQUATION_BASE_E && nparams != 3) || + (type == PNG_EQUATION_ARBITRARY && nparams != 3) || + (type == PNG_EQUATION_HYPERBOLIC && nparams != 4)) { png_warning(png_ptr, "Invalid pCAL parameters for equation type"); png_free(png_ptr, purpose); return; } - else if (type >= PNG_ETQUATION_LAST) + else if (type >= PNG_EQUATION_LAST) { png_warning(png_ptr, "Unrecognized equation type for pCAL chunk"); } @@ -2211,7 +2211,7 @@ png_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) png_crc_finish(png_ptr, skip); #if !defined(PNG_READ_USER_CHUNKS_SUPPORTED) - info_ptr = info_ptr; /* tquiet compiler warnings about unused info_ptr */ + info_ptr = info_ptr; /* quiet compiler warnings about unused info_ptr */ #endif } diff --git a/src/3rdparty/libpng/pngwrite.c b/src/3rdparty/libpng/pngwrite.c index 1e98090ab..10c9ea406 100644 --- a/src/3rdparty/libpng/pngwrite.c +++ b/src/3rdparty/libpng/pngwrite.c @@ -1444,7 +1444,7 @@ png_write_png(png_structp png_ptr, png_infop info_ptr, png_write_end(png_ptr, info_ptr); if(transforms == 0 || params == NULL) - /* tquiet compiler warnings */ return; + /* quiet compiler warnings */ return; } #endif #endif /* PNG_WRITE_SUPPORTED */ diff --git a/src/3rdparty/libpng/pngwutil.c b/src/3rdparty/libpng/pngwutil.c index d640179a7..43d26c2a6 100644 --- a/src/3rdparty/libpng/pngwutil.c +++ b/src/3rdparty/libpng/pngwutil.c @@ -1470,7 +1470,7 @@ png_write_pCAL(png_structp png_ptr, png_charp purpose, png_int_32 X0, int i; png_debug1(1, "in png_write_pCAL (%d parameters)\n", nparams); - if (type >= PNG_ETQUATION_LAST) + if (type >= PNG_EQUATION_LAST) png_warning(png_ptr, "Unrecognized equation type for pCAL chunk"); purpose_len = png_check_keyword(png_ptr, purpose, &new_purpose) + 1; diff --git a/src/3rdparty/libpng/scripts/makefile.amiga b/src/3rdparty/libpng/scripts/makefile.amiga index 9e352507a..79cb42499 100644 --- a/src/3rdparty/libpng/scripts/makefile.amiga +++ b/src/3rdparty/libpng/scripts/makefile.amiga @@ -22,7 +22,7 @@ LDLIBS= libpng.lib libgz.lib LIB:scm.lib LIB:sc.lib Lib:amiga.lib # linker LN= slink # file deletion command -RM= delete tquiet +RM= delete quiet # library (.lib) file creation command AR= oml # make directory command diff --git a/src/3rdparty/libpng/scripts/pngdef.pas b/src/3rdparty/libpng/scripts/pngdef.pas index ecfb8feb3..6e2068317 100644 --- a/src/3rdparty/libpng/scripts/pngdef.pas +++ b/src/3rdparty/libpng/scripts/pngdef.pas @@ -210,7 +210,7 @@ const 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 + PNG_CRC_QUIET_USE = 4; // quiet/use data quiet/use data PNG_CRC_NO_CHANGE = 5; // use current value use current value // Flags for png_set_filter() to say which filters to use. The flags diff --git a/src/3rdparty/libpng/scripts/smakefile.ppc b/src/3rdparty/libpng/scripts/smakefile.ppc index 5406dbbbc..e5c027841 100644 --- a/src/3rdparty/libpng/scripts/smakefile.ppc +++ b/src/3rdparty/libpng/scripts/smakefile.ppc @@ -13,7 +13,7 @@ RANLIB = ppc-amigaos-ranlib LDFLAGS = -r -o LDLIBS = ../zlib/libzip.a LIB:scppc.a LN = ppc-amigaos-ld -RM = delete tquiet +RM = delete quiet MKDIR = makedir OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o pngread.o \ diff --git a/src/3rdparty/sqlite/btree.c b/src/3rdparty/sqlite/btree.c index c5f077ab3..6b9c6b021 100644 --- a/src/3rdparty/sqlite/btree.c +++ b/src/3rdparty/sqlite/btree.c @@ -308,7 +308,7 @@ struct FreelistInfo { ** than can possibly fit on one page. In the steady state, every apCell[] ** points to memory inside u.aDisk[]. But in the middle of an insert ** operation, some apCell[] entries may temporarily point to data space -** outside of u.aDisk[]. This is a transient situation that is tquickly +** outside of u.aDisk[]. This is a transient situation that is quickly ** resolved. But while it is happening, it is possible for a database ** page to hold as many as two more cells than it might otherwise hold. ** The extra two entries in apCell[] are an allowance for this situation. @@ -772,7 +772,7 @@ static int fileBtreeSetSafetyLevel(Btree *pBt, int level){ /* ** Get a reference to page1 of the database file. This will -** also actquire a readlock on that file. +** also acquire a readlock on that file. ** ** SQLITE_OK is returned on success. If the file is not a ** well-formed database file, then SQLITE_CORRUPT is returned. @@ -997,7 +997,7 @@ static int fileBtreeRollbackCkpt(Btree *pBt){ /* ** Create a new cursor for the BTree whose root is on the page -** iTable. The act of actquiring a cursor gets a read lock on +** iTable. The act of acquiring a cursor gets a read lock on ** the database file. ** ** If wrFlag==0, then the cursor can only be used for reading. @@ -1028,7 +1028,7 @@ static int fileBtreeRollbackCkpt(Btree *pBt){ ** to write. ** ** No checking is done to make sure that page iTable really is the -** root page of a b-tree. If it is not, then the cursor actquired +** root page of a b-tree. If it is not, then the cursor acquired ** will not work correctly. */ static int fileBtreeCursor(Btree *pBt, int iTable, int wrFlag, BtCursor **ppCur){ @@ -3423,7 +3423,7 @@ char *fileBtreeIntegrityCheck(Btree *pBt, int *aRoot, int nRoot){ nRef = *sqlitepager_stats(pBt->pPager); if( lockBtree(pBt)!=SQLITE_OK ){ - return sqliteStrDup("Unable to actquire a read lock on the database"); + return sqliteStrDup("Unable to acquire a read lock on the database"); } sCheck.pBt = pBt; sCheck.pPager = pBt->pPager; diff --git a/src/3rdparty/sqlite/build.c b/src/3rdparty/sqlite/build.c index 2639604b3..87c88346b 100644 --- a/src/3rdparty/sqlite/build.c +++ b/src/3rdparty/sqlite/build.c @@ -527,7 +527,7 @@ void sqliteStartTable( /* Begin generating the code that will insert the table record into ** the SQLITE_MASTER table. Note in particular that we must go ahead ** and allocate the record number for the table entry now. Before any - ** PRIMARY KEY or UNITQUE keywords are parsed. Those keywords will cause + ** PRIMARY KEY or UNIQUE keywords are parsed. Those keywords will cause ** indices to be created and the table record must come before the ** indices. Hence, the record number for the table must be allocated ** now. @@ -1462,7 +1462,7 @@ void sqliteDeferForeignKey(Parse *pParse, int isDeferred){ ** Create a new index for an SQL table. pIndex is the name of the index ** and pTable is the name of the table that is to be indexed. Both will ** be NULL for a primary key or an index that is created to satisfy a -** UNITQUE constraint. If pTable and pIndex are NULL, use pParse->pNewTable +** UNIQUE constraint. If pTable and pIndex are NULL, use pParse->pNewTable ** as the table to be indexed. pParse->pNewTable is a table that is ** currently being constructed by a CREATE TABLE statement. ** @@ -1532,7 +1532,7 @@ void sqliteCreateIndex( ** index, then we will continue to process this index. ** ** If pName==0 it means that we are - ** dealing with a primary key or UNITQUE constraint. We have to invent our + ** dealing with a primary key or UNIQUE constraint. We have to invent our ** own name. */ if( pName && !db->init.busy ){ @@ -1674,7 +1674,7 @@ void sqliteCreateIndex( ** we don't want to recreate it. ** ** If pTable==0 it means this index is generated as a primary key - ** or UNITQUE constraint of a CREATE TABLE statement. Since the table + ** or UNIQUE constraint of a CREATE TABLE statement. Since the table ** has just been created, it contains no data and the index initialization ** step can be skipped. */ @@ -1768,7 +1768,7 @@ void sqliteDropIndex(Parse *pParse, SrcList *pName){ goto exit_drop_index; } if( pIndex->autoIndex ){ - sqliteErrorMsg(pParse, "index associated with UNITQUE " + sqliteErrorMsg(pParse, "index associated with UNIQUE " "or PRIMARY KEY constraint cannot be dropped", 0); goto exit_drop_index; } diff --git a/src/3rdparty/sqlite/insert.c b/src/3rdparty/sqlite/insert.c index 5957f3005..64e18ba05 100644 --- a/src/3rdparty/sqlite/insert.c +++ b/src/3rdparty/sqlite/insert.c @@ -567,7 +567,7 @@ insert_cleanup: ** aIdxUsed!=0 and aIdxUsed[i]!=0. ** ** This routine also generates code to check constraints. NOT NULL, -** CHECK, and UNITQUE constraints are all checked. If a constraint fails, +** CHECK, and UNIQUE constraints are all checked. If a constraint fails, ** then the appropriate action is performed. There are five possible ** actions: ROLLBACK, ABORT, FAIL, REPLACE, and IGNORE. ** @@ -595,7 +595,7 @@ insert_cleanup: ** value for that column. If the default value ** is NULL, the action is the same as ABORT. ** -** UNITQUE REPLACE The other row that conflicts with the row +** UNIQUE REPLACE The other row that conflicts with the row ** being inserted is removed. ** ** CHECK REPLACE Illegal. The results in an exception. @@ -753,7 +753,7 @@ void sqliteGenerateConstraintChecks( } } - /* Test all UNITQUE constraints by creating entries for each UNITQUE + /* Test all UNIQUE constraints by creating entries for each UNIQUE ** index and making sure that duplicate entries do not already exist. ** Add the new records to the indices as we go. */ @@ -777,7 +777,7 @@ void sqliteGenerateConstraintChecks( /* Find out what action to take in case there is an indexing conflict */ onError = pIdx->onError; - if( onError==OE_None ) continue; /* pIdx is not a UNITQUE index */ + if( onError==OE_None ) continue; /* pIdx is not a UNIQUE index */ if( overrideError!=OE_Default ){ onError = overrideError; }else if( pParse->db->onError!=OE_Default ){ @@ -843,7 +843,7 @@ void sqliteGenerateConstraintChecks( default: assert(0); } contAddr = sqliteVdbeCurrentAddr(v); -#if NULL_DISTINCT_FOR_UNITQUE +#if NULL_DISTINCT_FOR_UNIQUE sqliteVdbeChangeP2(v, jumpInst1, contAddr); #endif sqliteVdbeChangeP2(v, jumpInst2, contAddr); diff --git a/src/3rdparty/sqlite/main.c b/src/3rdparty/sqlite/main.c index 725b6503e..6fa014104 100644 --- a/src/3rdparty/sqlite/main.c +++ b/src/3rdparty/sqlite/main.c @@ -90,7 +90,7 @@ int sqliteInitCallback(void *pInit, int argc, char **argv, char **azColName){ db->init.iDb = 0; }else{ /* If the SQL column is blank it means this is an index that - ** was created to be the PRIMARY KEY or to fulfill a UNITQUE + ** was created to be the PRIMARY KEY or to fulfill a UNIQUE ** constraint for a CREATE TABLE. The index should have already ** been created when we processed the CREATE TABLE. All we have ** to do here is record the root page number for that index. diff --git a/src/3rdparty/sqlite/os.c b/src/3rdparty/sqlite/os.c index 3130bdeeb..b4ae7a107 100644 --- a/src/3rdparty/sqlite/os.c +++ b/src/3rdparty/sqlite/os.c @@ -1245,7 +1245,7 @@ int isNT(void){ ** A database write lock is obtained by locking all bytes in the range. ** There can only be one writer. ** -** A lock is obtained on the first byte of the lock range before actquiring +** A lock is obtained on the first byte of the lock range before acquiring ** either a read lock or a write lock. This prevents two processes from ** attempting to get a lock at a same time. The semantics of ** sqliteOsReadLock() require that if there is already a write lock, that @@ -1280,7 +1280,7 @@ int isNT(void){ /* ** Change the status of the lock on the file "id" to be a readlock. ** If the file was write locked, then this reduces the lock to a read. -** If the file was read locked, then this actquires a new read lock. +** If the file was read locked, then this acquires a new read lock. ** ** Return SQLITE_OK on success and SQLITE_BUSY on failure. If this ** library was compiled with large file support (LFS) but LFS is not @@ -1685,7 +1685,7 @@ static int inMutex = 0; ** executed code that is surrounded by EnterMutex() and LeaveMutex(). ** ** SQLite uses only a single Mutex. There is not much critical -** code and what little there is executes tquickly and without blocking. +** code and what little there is executes quickly and without blocking. */ void sqliteOsEnterMutex(){ #ifdef SQLITE_UNIX_THREADS diff --git a/src/3rdparty/sqlite/pager.c b/src/3rdparty/sqlite/pager.c index 32dcf19b2..8b6a15465 100644 --- a/src/3rdparty/sqlite/pager.c +++ b/src/3rdparty/sqlite/pager.c @@ -463,7 +463,7 @@ static void pager_reset(Pager *pPager){ /* ** When this routine is called, the pager has the journal file open and ** a write lock on the database. This routine releases the database -** write lock and actquires a read lock in its place. The journal file +** write lock and acquires a read lock in its place. The journal file ** is deleted and closed. ** ** TODO: Consider keeping the journal file open for temporary databases. @@ -1286,9 +1286,9 @@ static PgHdr *pager_get_all_dirty_pages(Pager *pPager){ } /* -** Actquire a page. +** Acquire a page. ** -** A read lock on the disk file is obtained when the first page is actquired. +** A read lock on the disk file is obtained when the first page is acquired. ** This read lock is dropped when the last page is released. ** ** A _get works for any page number greater than 0. If the database @@ -1297,13 +1297,13 @@ static PgHdr *pager_get_all_dirty_pages(Pager *pPager){ ** all zeros. The extra data appended to a page is always initialized ** to zeros the first time a page is loaded into memory. ** -** The actquisition might fail for several reasons. In all cases, +** The acquisition might fail for several reasons. In all cases, ** an appropriate error code is returned and *ppPage is set to NULL. ** ** See also sqlitepager_lookup(). Both this routine and _lookup() attempt ** to find a page in the in-memory cache first. If the page is not already ** in memory, this routine goes to disk to read it in whereas _lookup() -** just returns 0. This routine actquires a read-lock the first time it +** just returns 0. This routine acquires a read-lock the first time it ** has to go to disk, and could also playback an old journal if necessary. ** Since _lookup() never goes to disk, it never has to deal with locks ** or journal files. @@ -1366,7 +1366,7 @@ int sqlitepager_get(Pager *pPager, Pgno pgno, void **ppPage){ pPager->journalStarted = 0; /* Playback and delete the journal. Drop the database write - ** lock and reactquire the read lock. + ** lock and reacquire the read lock. */ rc = pager_playback(pPager, 0); if( rc!=SQLITE_OK ){ @@ -1544,7 +1544,7 @@ int sqlitepager_get(Pager *pPager, Pgno pgno, void **ppPage){ } /* -** Actquire a page if it is already in the in-memory cache. Do +** Acquire a page if it is already in the in-memory cache. Do ** not read the page from disk. Return a pointer to the page, ** or 0 if the page is not in cache. ** @@ -1692,7 +1692,7 @@ static int pager_open_journal(Pager *pPager){ } /* -** Actquire a write-lock on the database. The lock is removed when +** Acquire a write-lock on the database. The lock is removed when ** the any of the following happen: ** ** * sqlitepager_commit() is called. @@ -1702,7 +1702,7 @@ static int pager_open_journal(Pager *pPager){ ** ** The parameter to this routine is a pointer to any open page of the ** database file. Nothing changes about the page - it is used merely -** to actquire a pointer to the Pager structure and as proof that there +** to acquire a pointer to the Pager structure and as proof that there ** is already a read-lock on the database. ** ** A journal file is opened if this is not a temporary file. For @@ -1739,8 +1739,8 @@ int sqlitepager_begin(void *pData){ ** changes to a page. ** ** The first time this routine is called, the pager creates a new -** journal and actquires a write lock on the database. If the write -** lock could not be actquired, this routine returns SQLITE_BUSY. The +** journal and acquires a write lock on the database. If the write +** lock could not be acquired, this routine returns SQLITE_BUSY. The ** calling routine must check for that return value and be careful not to ** change any page data until this routine returns SQLITE_OK. ** diff --git a/src/3rdparty/sqlite/parse.c b/src/3rdparty/sqlite/parse.c index 2fd6ae395..463536915 100644 --- a/src/3rdparty/sqlite/parse.c +++ b/src/3rdparty/sqlite/parse.c @@ -711,7 +711,7 @@ static const YYCODETYPE yyFallback[] = { 0, /* FLOAT => nothing */ 0, /* NULL => nothing */ 0, /* PRIMARY => nothing */ - 0, /* UNITQUE => nothing */ + 0, /* UNIQUE => nothing */ 0, /* CHECK => nothing */ 0, /* REFERENCES => nothing */ 0, /* COLLATE => nothing */ @@ -840,7 +840,7 @@ static const char *yyTokenName[] = { "STAR", "SLASH", "REM", "CONCAT", "UMINUS", "UPLUS", "BITNOT", "STRING", "JOIN_KW", "INTEGER", "CONSTRAINT", "DEFAULT", - "FLOAT", "NULL", "PRIMARY", "UNITQUE", + "FLOAT", "NULL", "PRIMARY", "UNIQUE", "CHECK", "REFERENCES", "COLLATE", "ON", "DELETE", "UPDATE", "INSERT", "SET", "DEFERRABLE", "FOREIGN", "DROP", "UNION", @@ -935,7 +935,7 @@ static const char *yyRuleName[] = { /* 53 */ "ccons ::= NULL onconf", /* 54 */ "ccons ::= NOT NULL onconf", /* 55 */ "ccons ::= PRIMARY KEY sortorder onconf", - /* 56 */ "ccons ::= UNITQUE onconf", + /* 56 */ "ccons ::= UNIQUE onconf", /* 57 */ "ccons ::= CHECK LP expr RP onconf", /* 58 */ "ccons ::= REFERENCES nm idxlist_opt refargs", /* 59 */ "ccons ::= defer_subclause", @@ -962,7 +962,7 @@ static const char *yyRuleName[] = { /* 80 */ "conslist ::= tcons", /* 81 */ "tcons ::= CONSTRAINT nm", /* 82 */ "tcons ::= PRIMARY KEY LP idxlist RP onconf", - /* 83 */ "tcons ::= UNITQUE LP idxlist RP onconf", + /* 83 */ "tcons ::= UNIQUE LP idxlist RP onconf", /* 84 */ "tcons ::= CHECK expr onconf", /* 85 */ "tcons ::= FOREIGN KEY LP idxlist RP REFERENCES nm idxlist_opt refargs defer_subclause_opt", /* 86 */ "defer_subclause_opt ::=", @@ -1115,7 +1115,7 @@ static const char *yyRuleName[] = { /* 233 */ "expritem ::= expr", /* 234 */ "expritem ::=", /* 235 */ "cmd ::= CREATE uniqueflag INDEX nm ON nm dbnm LP idxlist RP onconf", - /* 236 */ "uniqueflag ::= UNITQUE", + /* 236 */ "uniqueflag ::= UNIQUE", /* 237 */ "uniqueflag ::=", /* 238 */ "idxlist_opt ::=", /* 239 */ "idxlist_opt ::= LP idxlist RP", @@ -2183,7 +2183,7 @@ static void yy_reduce( #line 191 "parse.y" {sqliteCreateIndex(pParse,0,0,0,yymsp[0].minor.yy372,0,0);} #line 2185 "parse.c" - /* No destructor defined for UNITQUE */ + /* No destructor defined for UNIQUE */ break; case 57: /* No destructor defined for CHECK */ @@ -2342,7 +2342,7 @@ static void yy_reduce( #line 238 "parse.y" {sqliteCreateIndex(pParse,0,0,yymsp[-2].minor.yy320,yymsp[0].minor.yy372,0,0);} #line 2344 "parse.c" - /* No destructor defined for UNITQUE */ + /* No destructor defined for UNIQUE */ /* No destructor defined for LP */ /* No destructor defined for RP */ break; @@ -3428,7 +3428,7 @@ static void yy_reduce( #line 740 "parse.y" { yygotominor.yy372 = OE_Abort; } #line 3430 "parse.c" - /* No destructor defined for UNITQUE */ + /* No destructor defined for UNIQUE */ break; case 237: #line 741 "parse.y" diff --git a/src/3rdparty/sqlite/parse.h b/src/3rdparty/sqlite/parse.h index 35949283f..188a336c8 100644 --- a/src/3rdparty/sqlite/parse.h +++ b/src/3rdparty/sqlite/parse.h @@ -92,7 +92,7 @@ #define TK_FLOAT 92 #define TK_NULL 93 #define TK_PRIMARY 94 -#define TK_UNITQUE 95 +#define TK_UNIQUE 95 #define TK_CHECK 96 #define TK_REFERENCES 97 #define TK_COLLATE 98 diff --git a/src/3rdparty/sqlite/sqliteInt.h b/src/3rdparty/sqlite/sqliteInt.h index 6fa4af400..4c2b64340 100644 --- a/src/3rdparty/sqlite/sqliteInt.h +++ b/src/3rdparty/sqlite/sqliteInt.h @@ -45,16 +45,16 @@ /* ** If the following macro is set to 1, then NULL values are considered ** distinct when determining whether or not two entries are the same -** in a UNITQUE index. This is the way PostgreSQL, Oracle, DB2, MySQL, +** in a UNIQUE index. This is the way PostgreSQL, Oracle, DB2, MySQL, ** OCELOT, and Firebird all work. The SQL92 spec explicitly says this ** is the way things are suppose to work. ** ** If the following macro is set to 0, the NULLs are indistinct for -** a UNITQUE index. In this mode, you can only have a single NULL entry -** for a column declared UNITQUE. This is the way Informix and SQL Server +** a UNIQUE index. In this mode, you can only have a single NULL entry +** for a column declared UNIQUE. This is the way Informix and SQL Server ** work. */ -#define NULL_DISTINCT_FOR_UNITQUE 1 +#define NULL_DISTINCT_FOR_UNIQUE 1 /* ** The maximum number of attached databases. This must be at least 2 @@ -559,7 +559,7 @@ struct FKey { ** occurs. IGNORE means that the particular row that caused the constraint ** error is not inserted or updated. Processing continues and no error ** is returned. REPLACE means that preexisting database rows that caused -** a UNITQUE constraint violation are removed so that the new insert or +** a UNIQUE constraint violation are removed so that the new insert or ** update can proceed. Processing continues and no error is reported. ** ** RESTRICT, SETNULL, and CASCADE actions apply only to foreign keys. @@ -619,7 +619,7 @@ struct Index { Table *pTable; /* The SQL table being indexed */ int tnum; /* Page containing root of this index in database file */ u8 onError; /* OE_Abort, OE_Ignore, OE_Replace, or OE_None */ - u8 autoIndex; /* True if is automatically created (ex: by UNITQUE) */ + u8 autoIndex; /* True if is automatically created (ex: by UNIQUE) */ u8 iDb; /* Index in sqlite.aDb[] of where this index is stored */ Index *pNext; /* The next index associated with the same table */ }; diff --git a/src/3rdparty/sqlite/tokenize.c b/src/3rdparty/sqlite/tokenize.c index 96dad9f41..d0a34fed2 100644 --- a/src/3rdparty/sqlite/tokenize.c +++ b/src/3rdparty/sqlite/tokenize.c @@ -130,7 +130,7 @@ static Keyword aKeywordTable[] = { { "TRANSACTION", TK_TRANSACTION, }, { "TRIGGER", TK_TRIGGER, }, { "UNION", TK_UNION, }, - { "UNITQUE", TK_UNITQUE, }, + { "UNIQUE", TK_UNIQUE, }, { "UPDATE", TK_UPDATE, }, { "USING", TK_USING, }, { "VACUUM", TK_VACUUM, }, diff --git a/src/3rdparty/sqlite/util.c b/src/3rdparty/sqlite/util.c index 074afedf9..16b3b46a0 100644 --- a/src/3rdparty/sqlite/util.c +++ b/src/3rdparty/sqlite/util.c @@ -933,7 +933,7 @@ static int sqlite_utf8_to_int(const unsigned char *z){ ** "[a-z]" matches any single lower-case letter. To match a '-', make ** it the last character in the list. ** -** This routine is usually tquick, but can be N**2 in the worst case. +** This routine is usually quick, but can be N**2 in the worst case. ** ** Hints: to match '*' or '?', put them in "[]". Like this: ** diff --git a/src/3rdparty/sqlite/vdbe.c b/src/3rdparty/sqlite/vdbe.c index 3f0965a93..0d3fb43e6 100644 --- a/src/3rdparty/sqlite/vdbe.c +++ b/src/3rdparty/sqlite/vdbe.c @@ -2348,7 +2348,7 @@ case OP_VerifyCookie: { ** ** There will be a read lock on the database whenever there is an ** open cursor. If the database was unlocked prior to this instruction -** then a read lock is actquired as part of this instruction. A read +** then a read lock is acquired as part of this instruction. A read ** lock allows other processes to read the database but prohibits ** any other process from modifying the database. The read lock is ** released when all cursors are closed. If this instruction attempts @@ -2741,7 +2741,7 @@ case OP_IsUnique: { /* The last four bytes of the key are different from R. Convert the ** last four bytes of the key into an integer and push it onto the ** stack. (These bytes are the record number of an entry that - ** violates a UNITQUE constraint.) + ** violates a UNIQUE constraint.) */ pTos++; pTos->i = v; diff --git a/src/3rdparty/sqlite/vdbeInt.h b/src/3rdparty/sqlite/vdbeInt.h index c5ac74950..79b6b51a5 100644 --- a/src/3rdparty/sqlite/vdbeInt.h +++ b/src/3rdparty/sqlite/vdbeInt.h @@ -182,7 +182,7 @@ struct AggElem { }; /* -** A Set structure is used for tquick testing to see if a value +** A Set structure is used for quick testing to see if a value ** is part of a small set. Sets are used to implement code like ** this: ** x.y IN ('hi','hoo','hum') diff --git a/src/3rdparty/sqlite/where.c b/src/3rdparty/sqlite/where.c index ea713c336..34195c651 100644 --- a/src/3rdparty/sqlite/where.c +++ b/src/3rdparty/sqlite/where.c @@ -412,7 +412,7 @@ WhereInfo *sqliteWhereBegin( exprAnalyze(&maskSet, &aExpr[i]); /* If we are executing a trigger body, remove all references to - ** new.* and old.* tables from the preretquisite masks. + ** new.* and old.* tables from the prerequisite masks. */ if( pParse->trigStack ){ int x; diff --git a/src/3rdparty/zlib/deflate.c b/src/3rdparty/zlib/deflate.c index c7f75a3ec..0fc53bc1e 100644 --- a/src/3rdparty/zlib/deflate.c +++ b/src/3rdparty/zlib/deflate.c @@ -154,7 +154,7 @@ local const config configuration_table[10] = { * meaning. */ -#define ETQUAL 0 +#define EQUAL 0 /* result of memcmp for equal strings */ #ifndef NO_DUMMY_DECL @@ -1064,7 +1064,7 @@ local void check_match(s, start, match, length) { /* check that the match is indeed a match */ if (zmemcmp(s->window + match, - s->window + start, length) != ETQUAL) { + s->window + start, length) != EQUAL) { fprintf(stderr, " start %u, match %u, length %d\n", start, match, length); do { diff --git a/src/3rdparty/zlib/zlib.h b/src/3rdparty/zlib/zlib.h index 4c01661b0..c563991e7 100644 --- a/src/3rdparty/zlib/zlib.h +++ b/src/3rdparty/zlib/zlib.h @@ -590,7 +590,7 @@ ZEXTERN int Q_ZEXPORT deflateParams OF((z_streamp strm, Dynamically update the compression level and compression strategy. The interpretation of level and strategy is as in deflateInit2. This can be used to switch between compression and straight copy of the input data, or - to switch to a different kind of input data retquiring a different + to switch to a different kind of input data requiring a different strategy. If the compression level is changed, the input available so far is compressed with the old level (and may be flushed); the new level will take effect only at the next call of deflate(). |