diff options
author | Timothy Pearson <[email protected]> | 2013-05-07 21:58:34 -0500 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-05-07 21:58:34 -0500 |
commit | c740211ffba3330d951f4c3ddefea8edf23a01cd (patch) | |
tree | 0a8b7641d3c5b576d18a2f7912c75fc600f494e2 /src/3rdparty/libmng | |
parent | 8a4eacb6185de3653f6ae401c352aef833a9e72a (diff) | |
download | tqt3-c740211ffba3330d951f4c3ddefea8edf23a01cd.tar.gz tqt3-c740211ffba3330d951f4c3ddefea8edf23a01cd.zip |
Automated update from Qt3
Diffstat (limited to 'src/3rdparty/libmng')
-rw-r--r-- | src/3rdparty/libmng/README.autoconf | 2 | ||||
-rw-r--r-- | src/3rdparty/libmng/aclocal.m4 | 4 | ||||
-rwxr-xr-x | src/3rdparty/libmng/configure | 8 | ||||
-rw-r--r-- | src/3rdparty/libmng/doc/libmng.txt | 2 | ||||
-rw-r--r-- | src/3rdparty/libmng/doc/man/libmng.3 | 2 | ||||
-rw-r--r-- | src/3rdparty/libmng/libmng.h | 4 | ||||
-rw-r--r-- | src/3rdparty/libmng/libmng_chunk_io.c | 186 | ||||
-rw-r--r-- | src/3rdparty/libmng/libmng_error.c | 2 | ||||
-rw-r--r-- | src/3rdparty/libmng/ltmain.sh | 8 |
9 files changed, 109 insertions, 109 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 |