diff options
| author | Timothy Pearson <[email protected]> | 2011-12-05 16:44:56 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2011-12-05 16:44:56 -0600 |
| commit | ceaf41bd779bdcc293a4f43100a3834c72c2c46d (patch) | |
| tree | eb429d42c0ab5b5404d65e79ab4e9884775f0614 /src/3rdparty/libmng | |
| parent | 5dea938f814eff53a106e572c98620ecd0043bd9 (diff) | |
| download | tqt3-ceaf41bd779bdcc293a4f43100a3834c72c2c46d.tar.gz tqt3-ceaf41bd779bdcc293a4f43100a3834c72c2c46d.zip | |
Update from latest conversion script
Diffstat (limited to 'src/3rdparty/libmng')
| -rw-r--r-- | src/3rdparty/libmng/libmng.h | 2 | ||||
| -rw-r--r-- | src/3rdparty/libmng/libmng_chunk_io.c | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/3rdparty/libmng/libmng.h b/src/3rdparty/libmng/libmng.h index 1880743d4..0284f1cb3 100644 --- a/src/3rdparty/libmng/libmng.h +++ b/src/3rdparty/libmng/libmng.h @@ -779,7 +779,7 @@ MNG_EXT mng_retcode MNG_DECL mng_set_doprogressive (mng_handle hHandle, system-defined default. TO RECAP: for sRGB systems (Windows, Linux) no action retquired! - for non-sRGB systems (SGI, Mac, Next) ACTION RETQUIRED! + for non-sRGB systems (SGI, Mac, Next) ACTION REQUIRED! Please visit http://www.srgb.com, http://www.color.org and http://www.littlecms.com for more info. diff --git a/src/3rdparty/libmng/libmng_chunk_io.c b/src/3rdparty/libmng/libmng_chunk_io.c index e22310e99..737bc7cf3 100644 --- a/src/3rdparty/libmng/libmng_chunk_io.c +++ b/src/3rdparty/libmng/libmng_chunk_io.c @@ -3917,7 +3917,7 @@ READ_CHUNK (read_fram) mng_uint32 iNamelen; #endif mng_uint32 iRemain; - mng_uint32 iRetquired = 0; + mng_uint32 iRequired = 0; #ifdef MNG_SUPPORT_TRACE MNG_TRACE (pData, MNG_FN_READ_FRAM, MNG_LC_START) @@ -3958,20 +3958,20 @@ READ_CHUNK (read_fram) if (iRemain) { - iRetquired = 4; /* calculate and check retquired remaining length */ + iRequired = 4; /* calculate and check retquired remaining length */ - if (*(pTemp+1)) { iRetquired += 4; } - if (*(pTemp+2)) { iRetquired += 4; } - if (*(pTemp+3)) { iRetquired += 17; } + if (*(pTemp+1)) { iRequired += 4; } + if (*(pTemp+2)) { iRequired += 4; } + if (*(pTemp+3)) { iRequired += 17; } if (*(pTemp+4)) { - if ((iRemain - iRetquired) % 4 != 0) + if ((iRemain - iRequired) % 4 != 0) MNG_ERROR (pData, MNG_INVALIDLENGTH) } else { - if (iRemain != iRetquired) + if (iRemain != iRequired) MNG_ERROR (pData, MNG_INVALIDLENGTH) } } @@ -4130,7 +4130,7 @@ READ_CHUNK (read_fram) if (((mng_framp)*ppChunk)->iChangesyncid) { - ((mng_framp)*ppChunk)->iCount = (iRemain - iRetquired) / 4; + ((mng_framp)*ppChunk)->iCount = (iRemain - iRequired) / 4; if (((mng_framp)*ppChunk)->iCount) { |