diff options
Diffstat (limited to 'src/3rdparty/libmng')
25 files changed, 141 insertions, 141 deletions
diff --git a/src/3rdparty/libmng/LICENSE b/src/3rdparty/libmng/LICENSE index 1dca4a86..bae3a820 100644 --- a/src/3rdparty/libmng/LICENSE +++ b/src/3rdparty/libmng/LICENSE @@ -41,8 +41,8 @@ /* * * */ /* * Parts of this software have been adapted from the libpng package. * */ /* * Although this library supports all features from the PNG specification * */ -/* * (as MNG descends from it) it does not retquire the libpng package. * */ -/* * It does retquire the zlib library and optionally the IJG jpeg library, * */ +/* * (as MNG descends from it) it does not require the libpng package. * */ +/* * It does require the zlib library and optionally the IJG jpeg library, * */ /* * and/or the "little-cms" library by Marti Maria (depending on the * */ /* * inclusion of support for JNG and Full-Color-Management respectively. * */ /* * * */ diff --git a/src/3rdparty/libmng/Makefile.in b/src/3rdparty/libmng/Makefile.in index e738c7e4..4d72bb97 100644 --- a/src/3rdparty/libmng/Makefile.in +++ b/src/3rdparty/libmng/Makefile.in @@ -378,7 +378,7 @@ maintainer-clean-am: maintainer-clean-libLTLIBRARIES \ maintainer-clean-tags maintainer-clean-generic \ distclean-am @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may retquire special tools to rebuild." + @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-am -rm -f config.status diff --git a/src/3rdparty/libmng/README.autoconf b/src/3rdparty/libmng/README.autoconf index ed863b26..ba4282ed 100644 --- a/src/3rdparty/libmng/README.autoconf +++ b/src/3rdparty/libmng/README.autoconf @@ -67,7 +67,7 @@ The simplest way to compile this package is: Compilers and Options ===================== - Some systems retquire unusual options for compilation or linking that + Some systems require unusual options for compilation or linking that the `configure' script does not know about. You can give `configure' initial values for variables by setting them in the environment. Using a Bourne-compatible shell, you can do that on the command line like diff --git a/src/3rdparty/libmng/README.config b/src/3rdparty/libmng/README.config index 3cb3e4fa..d5cd4541 100644 --- a/src/3rdparty/libmng/README.config +++ b/src/3rdparty/libmng/README.config @@ -36,12 +36,12 @@ which will speed up the compilation process. #define MNG_SUPPORT_FULL / #define MNG_SUPPORT_LC / #define MNG_SUPPORT_VLC -These can be used to indicate the level of MNG spec compliance retquired. +These can be used to indicate the level of MNG spec compliance required. Currently only full MNG compliance is supported. #define MNG_SUPPORT_IJG6B -This can be used to indicate if JNG support is retquired. This option will +This can be used to indicate if JNG support is required. This option will include the IJG JPEG-library. Note that MNG_SUPPORT_FULL will automatically set this option. Use this only if you need JNG support with MNG-(V)LC. diff --git a/src/3rdparty/libmng/README.dll b/src/3rdparty/libmng/README.dll index 50cb96a3..2f779e81 100644 --- a/src/3rdparty/libmng/README.dll +++ b/src/3rdparty/libmng/README.dll @@ -3,9 +3,9 @@ Standard Windows DLL The DLL provided in the BCB/win32dll directory is meant as the sole candidate for distributions, based on libmng.dll, that install the DLL into the public -Windows system-directory. The outline herein defines the retquirements to +Windows system-directory. The outline herein defines the requirements to which such a distribution must comply. If you cannot comply with these -retquirements please install the dll in the same directory as your application +requirements please install the dll in the same directory as your application and NOT in the Windows system-directory!!! diff --git a/src/3rdparty/libmng/aclocal.m4 b/src/3rdparty/libmng/aclocal.m4 index 0e1a6733..15199022 100644 --- a/src/3rdparty/libmng/aclocal.m4 +++ b/src/3rdparty/libmng/aclocal.m4 @@ -246,7 +246,7 @@ AC_DEFUN([AM_PROG_CC_STDC], [AC_REQUIRE([AC_PROG_CC]) AC_BEFORE([$0], [AC_C_INLINE]) AC_BEFORE([$0], [AC_C_CONST]) -dnl Force this before AC_PROG_CPP. Some cpp's, eg on HPUX, retquire +dnl Force this before AC_PROG_CPP. Some cpp's, eg on HPUX, require dnl a magic option to avoid problems with ANSI preprocessor commands dnl like #elif. dnl FIXME: can't do this because then AC_AIX won't work due to a @@ -348,7 +348,7 @@ AC_REQUIRE([AC_EXEEXT])dnl dnl _LT_AC_PROG_ECHO_BACKSLASH -# Only perform the check for file, if the check method retquires it +# Only perform the check for file, if the check method requires it case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then @@ -421,8 +421,8 @@ ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL], case $host/$CC in *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*) - # old mingw systems retquire "-dll" to link a DLL, while more recent ones - # retquire "-mdll" + # old mingw systems require "-dll" to link a DLL, while more recent ones + # require "-mdll" SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -mdll" AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch, @@ -430,7 +430,7 @@ ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL], CFLAGS="$SAVE_CFLAGS" ;; *-*-cygwin* | *-*-pw32*) # cygwin systems need to pass --dll to the linker, and not link - # crt.o which will retquire a WinMain@16 definition. + # crt.o which will require a WinMain@16 definition. lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;; esac ;; @@ -680,7 +680,7 @@ SHELL=${CONFIG_SHELL-/bin/sh} case X$ECHO in X*--fallback-echo) - # Remove one level of quotation (which was retquired for Make). + # Remove one level of quotation (which was required for Make). ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` ;; esac @@ -1030,7 +1030,7 @@ rm="rm -f" default_ofile=libtool can_build_shared=yes -# All known linkers retquire a `.a' archive for static linking (except M$VC, +# All known linkers require a `.a' archive for static linking (except M$VC, # which needs '.lib'). libext=a ltmain="$ac_aux_dir/ltmain.sh" @@ -1307,7 +1307,7 @@ fi # Check for any special shared library compilation flags. if test -n "$lt_cv_prog_cc_shlib"; then - AC_MSG_WARN([\`$CC' retquires \`$lt_cv_prog_cc_shlib' to build shared libraries]) + AC_MSG_WARN([\`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries]) if echo "$old_CC $old_CFLAGS " | egrep -e "[[ ]]$lt_cv_prog_cc_shlib[[ ]]" >/dev/null; then : else AC_MSG_WARN([add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure]) @@ -2362,7 +2362,7 @@ hpux9* | hpux10* | hpux11*) need_lib_prefix=no need_version=no shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is retquired to enable SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl' soname_spec='${libname}${release}.sl$major' # HP-UX runs *really* slowly unless shared libraries are mode 555. @@ -2984,7 +2984,7 @@ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Fix the shell variable \$srcfile for the compiler. fix_srcfile_path="$fix_srcfile_path" -# Set to yes if exported symbols are retquired. +# Set to yes if exported symbols are required. always_export_symbols=$always_export_symbols # The commands to list exported symbols. @@ -3084,7 +3084,7 @@ EOF # #include <fcntl.h> /* for O_RDONLY, O_BINARY */ # #include <string.h> /* for strdup() */ # -# /* O_BINARY isn't retquired (or even defined sometimes) under Unix */ +# /* O_BINARY isn't required (or even defined sometimes) under Unix */ # #ifndef O_BINARY # #define O_BINARY 0 # #endif diff --git a/src/3rdparty/libmng/configure b/src/3rdparty/libmng/configure index d9f4169a..9725a723 100755 --- a/src/3rdparty/libmng/configure +++ b/src/3rdparty/libmng/configure @@ -37,7 +37,7 @@ SHELL=${CONFIG_SHELL-/bin/sh} case X$ECHO in X*--fallback-echo) - # Remove one level of quotation (which was retquired for Make). + # Remove one level of quotation (which was required for Make). ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','` ;; esac @@ -850,7 +850,7 @@ test "$program_prefix" != NONE && test "$program_suffix" != NONE && program_transform_name="s,\$\$,${program_suffix},; $program_transform_name" -# sed with no file args retquires a program. +# sed with no file args requires a program. test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 @@ -2386,7 +2386,7 @@ done -# Only perform the check for file, if the check method retquires it +# Only perform the check for file, if the check method requires it case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then @@ -2762,7 +2762,7 @@ rm="rm -f" default_ofile=libtool can_build_shared=yes -# All known linkers retquire a `.a' archive for static linking (except M$VC, +# All known linkers require a `.a' archive for static linking (except M$VC, # which needs '.lib'). libext=a ltmain="$ac_aux_dir/ltmain.sh" @@ -3070,7 +3070,7 @@ fi # Check for any special shared library compilation flags. if test -n "$lt_cv_prog_cc_shlib"; then - echo "configure: warning: \`$CC' retquires \`$lt_cv_prog_cc_shlib' to build shared libraries" 1>&2 + echo "configure: warning: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" 1>&2 if echo "$old_CC $old_CFLAGS " | egrep -e "[ ]$lt_cv_prog_cc_shlib[ ]" >/dev/null; then : else echo "configure: warning: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" 1>&2 @@ -4191,7 +4191,7 @@ hpux9* | hpux10* | hpux11*) need_lib_prefix=no need_version=no shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is retquired to enable SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl' soname_spec='${libname}${release}.sl$major' # HP-UX runs *really* slowly unless shared libraries are mode 555. @@ -5326,7 +5326,7 @@ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Fix the shell variable \$srcfile for the compiler. fix_srcfile_path="$fix_srcfile_path" -# Set to yes if exported symbols are retquired. +# Set to yes if exported symbols are required. always_export_symbols=$always_export_symbols # The commands to list exported symbols. @@ -5426,7 +5426,7 @@ EOF # #include <fcntl.h> /* for O_RDONLY, O_BINARY */ # #include <string.h> /* for strdup() */ # -# /* O_BINARY isn't retquired (or even defined sometimes) under Unix */ +# /* O_BINARY isn't required (or even defined sometimes) under Unix */ # #ifndef O_BINARY # #define O_BINARY 0 # #endif @@ -6642,7 +6642,7 @@ EOF -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" ;; *) - # `set' quotes correctly as retquired by POSIX, so do not add quotes. + # `set' quotes correctly as required by POSIX, so do not add quotes. sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' ;; esac >> confcache diff --git a/src/3rdparty/libmng/configure.in b/src/3rdparty/libmng/configure.in index 4b0c85c3..511b3633 100644 --- a/src/3rdparty/libmng/configure.in +++ b/src/3rdparty/libmng/configure.in @@ -23,7 +23,7 @@ AC_PROG_INSTALL dnl support for files >2GB AC_SYS_LARGEFILE -dnl Check for retquired header files +dnl Check for required header files AC_HEADER_STDC dnl Checks for typedefs, structures, and compiler characteristics. @@ -89,7 +89,7 @@ dnl this should always be on AC_DEFINE(MNG_ERROR_TELLTALE) -dnl libz is retquired. +dnl libz is required. AC_ARG_WITH(zlib, [ --with-zlib[=DIR] use zlib include/library files in DIR],[ if test -d "$withval"; then diff --git a/src/3rdparty/libmng/doc/libmng.txt b/src/3rdparty/libmng/doc/libmng.txt index 95c086db..a18940bb 100644 --- a/src/3rdparty/libmng/doc/libmng.txt +++ b/src/3rdparty/libmng/doc/libmng.txt @@ -97,7 +97,7 @@ with the given size. A typical implementation would be: return calloc (1, iSize); } -Note that the library retquires you to zero-out the memory-block!!! +Note that the library requires you to zero-out the memory-block!!! - void mng_memfree (mng_ptr pPtr, mng_size_t iLen) @@ -127,7 +127,7 @@ reading an image. The reading process supports two modes: Suspension-mode (SMOD) and non-suspension-mode (NSMOD). See mng_set_suspensionmode() for a more detailed description. -In NSMOD, the library retquires you to return exactly the amount of bytes +In NSMOD, the library requires you to return exactly the amount of bytes requested (= iBuflen). Any lesser amount indicates the input file is exhausted and the library will return a MNG_UNEXPECTEDEOF errorcode. @@ -279,7 +279,7 @@ clock. The entire animation timing depends heavily on this function, - mng_bool mng_settimer (mng_handle hHandle, mng_uint32 iMsecs) -This callback is activated every time the library retquires a "pause". +This callback is activated every time the library requires a "pause". Note that the function itself should NOT execute the wait. It should simply store the time-field and allow the library to return. Libmng will return with the MNG_NEEDTIMERWAIT code, indicating the callback @@ -313,7 +313,7 @@ settimer() callbacks are crucial for proper animation timing. mng_bool bIsRGBA16, mng_ptr pRow) -These callbacks are only retquired when you selected the MNG_APP_CMS +These callbacks are only required when you selected the MNG_APP_CMS directive during compilation of the library. See the configuration section for more details. @@ -384,9 +384,9 @@ This function will clear all internal state variables, free any stored chunks and/or objects, etc, etc. Your callbacks and other external parameters will be retained. -After you successfully received the handle it is time to set the retquired +After you successfully received the handle it is time to set the required callbacks. The sections on reading, displaying & writing indicate which -callbacks are retquired and which are optional. +callbacks are required and which are optional. To set the callbacks simply do: myretcode = mng_setcb_xxxxxx (myhandle, my_xxxxxx); @@ -492,7 +492,7 @@ input. This allows your application to receive data of arbitrarily length and return this in the mng_readdata() callback, without disturbing the chunk processing routines of the library. -Suspension-mode does retquire a little extra care in the main logic of the +Suspension-mode does require a little extra care in the main logic of the 1application. The read function may return with MNG_NEEDMOREDATA when the mng_readdata() callback returns less data then it needs to process the next chunk. This indicates the application to wait for more data to arrive @@ -547,7 +547,7 @@ until it either reaches EOF (indicated by the mng_readdata() callback) or implicitly decides EOF as it processed the logically last chunk of the image. -Applications that retquire strict conformity and do not allow superfluous +Applications that require strict conformity and do not allow superfluous data after the ending chunk, will need to perform this check in their mng_closestream() callback. @@ -578,7 +578,7 @@ mng_set_storechunks() function. If set to MNG_TRUE, chunks will be stored as they are read. At any point you can then call the mng_iterate_chunks() function -to iterate through the current list of chunks. This function retquires +to iterate through the current list of chunks. This function requires a callback which is called for each chunk and receives a specific chunk-handle. This chunk-handle can be used to call the appropriate mng_getchunk_xxxx() function, to access the chunks properties. @@ -663,7 +663,7 @@ If you like to do alpha composition yourself you can select one of the canvas styles that include an alpha channel. You can even have a separate alpha canvas by selecting the MNG_CANVAS_RGB8_A8 style. -All styles retquire a compact model. Eg. MNG_CANVAS_BGR8 retquires +All styles require a compact model. Eg. MNG_CANVAS_BGR8 requires your canvas lines in bgrbgrbgr... storage, where each letter represents an 8-bit value of the corresponding color, and each threesome makes up the values of one(1) pixel. @@ -674,7 +674,7 @@ actually need to be consecutive in memory. > Alpha composition and application backgrounds -All Network Graphics can be partially transparent. This retquires +All Network Graphics can be partially transparent. This requires special processing if you need to display an image against some background. Note that the MNG header (MHDR chunk) contains a simplicity field indicating whether transparency information in @@ -700,7 +700,7 @@ set the values of the red, green and blue component of your preferred background color. Use one of the canvas styles that do not have an alpha-channel, and -which matches your output retquirements. +which matches your output requirements. > Composing against a background canvas @@ -713,7 +713,7 @@ be composed. Its size must match exactly with the image dimensions and thus the drawing canvas! Use one of the canvas styles that do not have an alpha-channel, and -which matches your output retquirements. The canvas style of the +which matches your output requirements. The canvas style of the background canvas may even differ from the drawing canvas. The library's composing will still function properly. @@ -783,7 +783,7 @@ Images will definitely not be displayed as seen by the Author!!! > Animations and timing -Animations retquire some form of timing support. The library relies +Animations require some form of timing support. The library relies on two callbacks for this purpose. The mng_gettickcount() and mng_settimer() callbacks. mng_gettickcount() is used to determine the passing of time in milliseconds since the beginning of the @@ -798,7 +798,7 @@ input from an internal clock. The value returned from this function is more than adequate for libmng. The mng_settimer() callback is called when the library determines -a little "pause" is retquired before rendering another frame of the +a little "pause" is required before rendering another frame of the animation. The pause interval is also expressed in milliseconds. Your application should store this value and return immediately. The library will then make appropriate arrangements to store its @@ -836,7 +836,7 @@ applications as well. The method is usually used in unison with the suspension-mode of the read module. A typical implementation would look like this: - /* initiale library and set retquired callbacks */ + /* initiale library and set required callbacks */ /* activate suspension-mode */ myretcode = mng_set_suspensionmode (myhandle, @@ -859,7 +859,7 @@ the read module. A typical implementation would look like this: if (myretcode != MNG_NOERROR) /* process error */; -More advanced programming methods may retquire a different approach, +More advanced programming methods may require a different approach, but the final result should function as in the code above. @@ -881,7 +881,7 @@ Once you have successfully read the file, all you need to do is: if (myretcode != MNG_NOERROR) /* process error */; -Again, more advanced programming methods may retquire a different +Again, more advanced programming methods may require a different approach, but the final result should function as in the code above. @@ -1004,7 +1004,7 @@ write it out as a copy or something. You MUST have compiled the library with the MNG_STORE_CHUNKS directive, and you must have done mng_set_storechunks (myhandle, MNG_TRUE). -This doesn't retquire the MNG_ACCESS_CHUNKS directive, unless you want +This doesn't require the MNG_ACCESS_CHUNKS directive, unless you want to fiddle with the chunks as well. Again all you need to do is: @@ -1094,8 +1094,8 @@ Remarks : Parts of this software have been adapted from the libpng library. Although this library supports all features from the PNG specification -(as MNG descends from it) it does not retquire the libpng library. -It does retquire the zlib library and optionally the IJG JPEG library, +(as MNG descends from it) it does not require the libpng library. +It does require the zlib library and optionally the IJG JPEG library, and/or the "little-cms" library by Marti Maria Saguer (depending on the inclusion of support for JNG and Full-Color-Management respectively. diff --git a/src/3rdparty/libmng/doc/man/libmng.3 b/src/3rdparty/libmng/doc/man/libmng.3 index c86faf61..bdc47457 100644 --- a/src/3rdparty/libmng/doc/man/libmng.3 +++ b/src/3rdparty/libmng/doc/man/libmng.3 @@ -107,7 +107,7 @@ with the given size. A typical implementation would be: return calloc (1, iSize); } -Note that the library retquires you to zero-out the memory-block!!! +Note that the library requires you to zero-out the memory-block!!! \- void mng_memfree (mng_ptr pPtr, mng_size_t iLen) @@ -138,7 +138,7 @@ reading an image. The reading process supports two modes: Suspension-mode (SMOD) and non-suspension-mode (NSMOD). See mng_set_suspensionmode() for a more detailed description. -In NSMOD, the library retquires you to return exactly the amount of bytes +In NSMOD, the library requires you to return exactly the amount of bytes requested (= iBuflen). Any lesser amount indicates the input file is exhausted and the library will return a MNG_UNEXPECTEDEOF errorcode. @@ -293,7 +293,7 @@ clock. The entire animation timing depends heavily on this function, \- mng_bool mng_settimer (mng_handle hHandle, mng_uint32 iMsecs) -This callback is activated every time the library retquires a "pause". +This callback is activated every time the library requires a "pause". Note that the function itself should NOT execute the wait. It should simply store the time-field and allow the library to return. Libmng will return with the MNG_NEEDTIMERWAIT code, indicating the callback @@ -331,7 +331,7 @@ settimer() callbacks are crucial for proper animation timing. mng_bool bIsRGBA16, mng_ptr pRow) -These callbacks are only retquired when you selected the MNG_APP_CMS +These callbacks are only required when you selected the MNG_APP_CMS directive during compilation of the library. See the configuration section for more details. @@ -402,9 +402,9 @@ This function will clear all internal state variables, free any stored chunks and/or objects, etc, etc. Your callbacks and other external parameters will be retained. -After you successfully received the handle it is time to set the retquired +After you successfully received the handle it is time to set the required callbacks. The sections on reading, displaying & writing indicate which -callbacks are retquired and which are optional. +callbacks are required and which are optional. To set the callbacks simply do: myretcode = mng_setcb_xxxxxx (myhandle, my_xxxxxx); @@ -510,7 +510,7 @@ input. This allows your application to receive data of arbitrarily length and return this in the mng_readdata() callback, without disturbing the chunk processing routines of the library. -Suspension-mode does retquire a little extra care in the main logic of the +Suspension-mode does require a little extra care in the main logic of the 1application. The read function may return with MNG_NEEDMOREDATA when the mng_readdata() callback returns less data then it needs to process the next chunk. This indicates the application to wait for more data to arrive @@ -565,7 +565,7 @@ until it either reaches EOF (indicated by the mng_readdata() callback) or implicitly decides EOF as it processed the logically last chunk of the image. -Applications that retquire strict conformity and do not allow superfluous +Applications that require strict conformity and do not allow superfluous data after the ending chunk, will need to perform this check in their mng_closestream() callback. @@ -596,7 +596,7 @@ mng_set_storechunks() function. If set to MNG_TRUE, chunks will be stored as they are read. At any point you can then call the mng_iterate_chunks() function -to iterate through the current list of chunks. This function retquires +to iterate through the current list of chunks. This function requires a callback which is called for each chunk and receives a specific chunk-handle. This chunk-handle can be used to call the appropriate mng_getchunk_xxxx() function, to access the chunks properties. @@ -681,7 +681,7 @@ If you like to do alpha composition yourself you can select one of the canvas styles that include an alpha channel. You can even have a separate alpha canvas by selecting the MNG_CANVAS_RGB8_A8 style. -All styles retquire a compact model. Eg. MNG_CANVAS_BGR8 retquires +All styles require a compact model. Eg. MNG_CANVAS_BGR8 requires your canvas lines in bgrbgrbgr... storage, where each letter represents an 8-bit value of the corresponding color, and each threesome makes up the values of one(1) pixel. @@ -692,7 +692,7 @@ actually need to be consecutive in memory. .SS Alpha composition and application backgrounds -All Network Graphics can be partially transparent. This retquires +All Network Graphics can be partially transparent. This requires special processing if you need to display an image against some background. Note that the MNG header (MHDR chunk) contains a simplicity field indicating whether transparency information in @@ -718,7 +718,7 @@ set the values of the red, green and blue component of your preferred background color. Use one of the canvas styles that do not have an alpha-channel, and -which matches your output retquirements. +which matches your output requirements. .SS Composing against a background canvas @@ -731,7 +731,7 @@ be composed. Its size must match exactly with the image dimensions and thus the drawing canvas! Use one of the canvas styles that do not have an alpha-channel, and -which matches your output retquirements. The canvas style of the +which matches your output requirements. The canvas style of the background canvas may even differ from the drawing canvas. The library's composing will still function properly. @@ -801,7 +801,7 @@ Images will definitely not be displayed as seen by the Author!!! .SS Animations and timing -Animations retquire some form of timing support. The library relies +Animations require some form of timing support. The library relies on two callbacks for this purpose. The mng_gettickcount() and mng_settimer() callbacks. mng_gettickcount() is used to determine the passing of time in milliseconds since the beginning of the @@ -816,7 +816,7 @@ input from an internal clock. The value returned from this function is more than adequate for libmng. The mng_settimer() callback is called when the library determines -a little "pause" is retquired before rendering another frame of the +a little "pause" is required before rendering another frame of the animation. The pause interval is also expressed in milliseconds. Your application should store this value and return immediately. The library will then make appropriate arrangements to store its @@ -854,7 +854,7 @@ applications as well. The method is usually used in unison with the suspension-mode of the read module. A typical implementation would look like this: - /* initiale library and set retquired callbacks */ + /* initiale library and set required callbacks */ /* activate suspension-mode */ myretcode = mng_set_suspensionmode (myhandle, @@ -877,7 +877,7 @@ the read module. A typical implementation would look like this: if (myretcode != MNG_NOERROR) /* process error */; -More advanced programming methods may retquire a different approach, +More advanced programming methods may require a different approach, but the final result should function as in the code above. @@ -899,7 +899,7 @@ Once you have successfully read the file, all you need to do is: if (myretcode != MNG_NOERROR) /* process error */; -Again, more advanced programming methods may retquire a different +Again, more advanced programming methods may require a different approach, but the final result should function as in the code above. @@ -1024,7 +1024,7 @@ write it out as a copy or something. You MUST have compiled the library with the MNG_STORE_CHUNKS directive, and you must have done mng_set_storechunks (myhandle, MNG_TRUE). -This doesn't retquire the MNG_ACCESS_CHUNKS directive, unless you want +This doesn't require the MNG_ACCESS_CHUNKS directive, unless you want to fiddle with the chunks as well. Again all you need to do is: @@ -1133,8 +1133,8 @@ source code in a product, acknowledgment would be highly appreciated. Parts of this software have been adapted from the libpng library. Although this library supports all features from the PNG specification -(as MNG descends from it) it does not retquire the libpng library. -It does retquire the zlib library and optionally the IJG JPEG library, +(as MNG descends from it) it does not require the libpng library. +It does require the zlib library and optionally the IJG JPEG library, and/or the "little-cms" library by Marti Maria Saguer (depending on the inclusion of support for JNG and Full-Color-Management respectively. diff --git a/src/3rdparty/libmng/libmng.h b/src/3rdparty/libmng/libmng.h index 0284f1cb..f9e7d525 100644 --- a/src/3rdparty/libmng/libmng.h +++ b/src/3rdparty/libmng/libmng.h @@ -41,8 +41,8 @@ /* * * */ /* * Parts of this software have been adapted from the libpng package. * */ /* * Although this library supports all features from the PNG specification * */ -/* * (as MNG descends from it) it does not retquire the libpng package. * */ -/* * It does retquire the zlib library and optionally the IJG jpeg library, * */ +/* * (as MNG descends from it) it does not require the libpng package. * */ +/* * It does require the zlib library and optionally the IJG jpeg library, * */ /* * and/or the "little-cms" library by Marti Maria (depending on the * */ /* * inclusion of support for JNG and Full-Color-Management respectively. * */ /* * * */ @@ -425,7 +425,7 @@ MNG_EXT mng_retcode MNG_DECL mng_cleanup (mng_handle* hHandle); /* use mng_read if you simply want to read a Network Graphic */ /* mng_read_resume is used in I/O-read-suspension scenarios, where the "readdata" callback may return FALSE & length=0 indicating it's buffer is - depleted or too short to supply the retquired bytes, and the buffer needs + depleted or too short to supply the required bytes, and the buffer needs to be refilled; libmng will return the errorcode MNG_NEEDMOREDATA telling the app to refill it's read-buffer after which it must call mng_read_resume (or mng_display_resume if it also displaying the image simultaneously) */ @@ -574,14 +574,14 @@ MNG_EXT mng_retcode MNG_DECL mng_setcb_processterm (mng_handle hHandle, it's output device (eg. in Win32 this would mean sending an invalidate message for the specified region */ /* NOTE that the update-region is specified as x,y,width,height; eg. the - invalidate message for Windows retquires left,top,right,bottom parameters + invalidate message for Windows requires left,top,right,bottom parameters where the bottom-right is exclusive of the region!! to get these correctly is as simple as: left = x; top = y; right = x + width; bottom = y + height; - if your implementation retquires inclusive points, simply subtract 1 from + if your implementation requires inclusive points, simply subtract 1 from both the right & bottom values calculated above. */ #ifdef MNG_SUPPORT_DISPLAY @@ -759,7 +759,7 @@ MNG_EXT mng_retcode MNG_DECL mng_set_doprogressive (mng_handle hHandle, If you have defined MNG_FULL_CMS (and are using lcms), you will have to think hard about the following routines. - lcms retquires 2 profiles to work off the differences in the input-image + lcms requires 2 profiles to work off the differences in the input-image and the output-device. The ICC profile for the input-image will be embedded within it to reflect its color-characteristics, but the output profile depends on the output-device, which is something only *YOU* know @@ -778,7 +778,7 @@ MNG_EXT mng_retcode MNG_DECL mng_set_doprogressive (mng_handle hHandle, set the profile manually, or, if you know how, set it from a system-defined default. - TO RECAP: for sRGB systems (Windows, Linux) no action retquired! + TO RECAP: for sRGB systems (Windows, Linux) no action required! for non-sRGB systems (SGI, Mac, Next) ACTION REQUIRED! Please visit http://www.srgb.com, http://www.color.org and @@ -946,13 +946,13 @@ MNG_EXT mng_uint8 MNG_DECL mng_get_alphacompression(mng_handle hHandle) MNG_EXT mng_uint8 MNG_DECL mng_get_alphafilter (mng_handle hHandle); MNG_EXT mng_uint8 MNG_DECL mng_get_alphainterlace (mng_handle hHandle); -/* indicates the predicted alpha-depth retquired to properly display the image */ +/* indicates the predicted alpha-depth required to properly display the image */ /* gets set once the graphics header is processed and is available in the processheader callback for any type of input-image (PNG, JNG or MNG) */ /* possible values are 0,1,2,4,8,16 - 0 = no transparency retquired - 1 = on/off transparency retquired (alpha-values are 0 or 2^bit_depth-1) - 2+ = semi-transparency retquired (values will be scaled to the bitdepth of the + 0 = no transparency required + 1 = on/off transparency required (alpha-values are 0 or 2^bit_depth-1) + 2+ = semi-transparency required (values will be scaled to the bitdepth of the canvasstyle supplied by the application) */ MNG_EXT mng_uint8 MNG_DECL mng_get_alphadepth (mng_handle hHandle); @@ -1112,7 +1112,7 @@ MNG_EXT mng_bool MNG_DECL mng_status_timerbreak (mng_handle hHandle) /* ************************************************************************** */ /* use this to iterate the stored chunks */ -/* retquires MNG_ACCESS_CHUNKS & MNG_STORE_CHUNKS */ +/* requires MNG_ACCESS_CHUNKS & MNG_STORE_CHUNKS */ /* starts from the supplied chunk-index-nr; the first chunk has index 0!! */ MNG_EXT mng_retcode MNG_DECL mng_iterate_chunks (mng_handle hHandle, mng_uint32 iChunkseq, @@ -1557,7 +1557,7 @@ MNG_EXT mng_retcode MNG_DECL mng_getchunk_unknown (mng_handle hHandle, #ifdef MNG_INCLUDE_WRITE_PROCS /* use these to create new chunks at the end of the chunk-list */ -/* retquires at least MNG_ACCESS_CHUNKS (MNG_SUPPORT_WRITE may be nice too) */ +/* requires at least MNG_ACCESS_CHUNKS (MNG_SUPPORT_WRITE may be nice too) */ MNG_EXT mng_retcode MNG_DECL mng_putchunk_ihdr (mng_handle hHandle, mng_uint32 iWidth, mng_uint32 iHeight, @@ -2099,8 +2099,8 @@ MNG_EXT mng_retcode MNG_DECL mng_updatemngsimplicity (mng_handle hHandle, #define MNG_SETQUENCEERROR (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 retquires PLTE */ -#define MNG_IDATMISSING (mng_retcode)1033 /* IHDR-block retquires IDAT */ +#define MNG_PLTEMISSING (mng_retcode)1032 /* indexed-color requires PLTE */ +#define MNG_IDATMISSING (mng_retcode)1033 /* IHDR-block requires IDAT */ #define MNG_CANNOTBEEMPTY (mng_retcode)1034 /* must contain some data */ #define MNG_GLOBALLENGTHERR (mng_retcode)1035 /* global data incorrect */ #define MNG_INVALIDBITDEPTH (mng_retcode)1036 /* bitdepth out-of-range */ @@ -2129,7 +2129,7 @@ MNG_EXT mng_retcode MNG_DECL mng_updatemngsimplicity (mng_handle hHandle, #define MNG_TARGETNOALPHA (mng_retcode)1059 /* object has no alpha-channel */ #define MNG_MNGTOOCOMPLEX (mng_retcode)1060 /* can't handle complexity */ #define MNG_UNKNOWNCRITICAL (mng_retcode)1061 /* unknown critical chunk found*/ -#define MNG_UNSUPPORTEDNEED (mng_retcode)1062 /* nEED retquirement unsupported*/ +#define MNG_UNSUPPORTEDNEED (mng_retcode)1062 /* nEED requirement unsupported*/ #define MNG_INVALIDDELTA (mng_retcode)1063 /* Delta operation illegal */ #define MNG_INVALIDMETHOD (mng_retcode)1064 /* invalid MAGN method */ @@ -2160,9 +2160,9 @@ MNG_EXT mng_retcode MNG_DECL mng_updatemngsimplicity (mng_handle hHandle, /* * Note that the intentions are pretty darn good, but that the focus * */ /* * is currently on 8-bit color support * */ /* * * */ -/* * The RGB8_A8 style is defined for apps that retquire a separate * */ +/* * The RGB8_A8 style is defined for apps that require a separate * */ /* * canvas for the color-planes and the alpha-plane (eg. mozilla) * */ -/* * This retquires for the app to supply the "getalphaline" callback!!! * */ +/* * This requires for the app to supply the "getalphaline" callback!!! * */ /* * * */ /* ************************************************************************** */ diff --git a/src/3rdparty/libmng/libmng_chunk_io.c b/src/3rdparty/libmng/libmng_chunk_io.c index 737bc7cf..f16ef91d 100644 --- a/src/3rdparty/libmng/libmng_chunk_io.c +++ b/src/3rdparty/libmng/libmng_chunk_io.c @@ -900,7 +900,7 @@ READ_CHUNK (read_idat) /* can only be empty in BASI-block! */ if ((iRawlen == 0) && (!pData->bHasBASI)) MNG_ERROR (pData, MNG_INVALIDLENGTH) - /* indexed-color retquires PLTE */ + /* indexed-color requires PLTE */ if ((pData->bHasIHDR) && (pData->iColortype == 3) && (!pData->bHasPLTE)) MNG_ERROR (pData, MNG_PLTEMISSING) @@ -959,7 +959,7 @@ READ_CHUNK (read_iend) if ((!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR)) #endif MNG_ERROR (pData, MNG_SETQUENCEERROR) - /* IHDR-block retquires IDAT */ + /* IHDR-block requires IDAT */ if ((pData->bHasIHDR) && (!pData->bHasIDAT)) MNG_ERROR (pData, MNG_IDATMISSING) @@ -3958,7 +3958,7 @@ READ_CHUNK (read_fram) if (iRemain) { - iRequired = 4; /* calculate and check retquired remaining length */ + iRequired = 4; /* calculate and check required remaining length */ if (*(pTemp+1)) { iRequired += 4; } if (*(pTemp+2)) { iRequired += 4; } @@ -6620,7 +6620,7 @@ WRITE_CHUNK (write_iccp) { pRawdata = pData->pWritebuf+8; /* init output buffer & size */ iRawlen = pICCP->iNamesize + 2 + iReallen; - /* retquires large buffer ? */ + /* requires large buffer ? */ if (iRawlen > pData->iWritebufsize) MNG_ALLOC (pData, pRawdata, iRawlen) @@ -6675,7 +6675,7 @@ WRITE_CHUNK (write_text) pRawdata = pData->pWritebuf+8; /* init output buffer & size */ iRawlen = pTEXT->iKeywordsize + 1 + pTEXT->iTextsize; - /* retquires large buffer ? */ + /* requires large buffer ? */ if (iRawlen > pData->iWritebufsize) MNG_ALLOC (pData, pRawdata, iRawlen) @@ -6732,7 +6732,7 @@ WRITE_CHUNK (write_ztxt) { pRawdata = pData->pWritebuf+8; /* init output buffer & size */ iRawlen = pZTXT->iKeywordsize + 2 + iReallen; - /* retquires large buffer ? */ + /* requires large buffer ? */ if (iRawlen > pData->iWritebufsize) MNG_ALLOC (pData, pRawdata, iRawlen) @@ -6804,7 +6804,7 @@ WRITE_CHUNK (write_itxt) iRawlen = iRawlen + iReallen; else iRawlen = iRawlen + pITXT->iTextsize; - /* retquires large buffer ? */ + /* requires large buffer ? */ if (iRawlen > pData->iWritebufsize) MNG_ALLOC (pData, pRawdata, iRawlen) @@ -7090,7 +7090,7 @@ WRITE_CHUNK (write_splt) pRawdata = pData->pWritebuf+8; /* init output buffer & size */ iEntrieslen = ((pSPLT->iSampledepth >> 3) * 4 + 2) * pSPLT->iEntrycount; iRawlen = pSPLT->iNamesize + 2 + iEntrieslen; - /* retquires large buffer ? */ + /* requires large buffer ? */ if (iRawlen > pData->iWritebufsize) MNG_ALLOC (pData, pRawdata, iRawlen) @@ -7551,7 +7551,7 @@ WRITE_CHUNK (write_past) pRawdata = pData->pWritebuf+8; /* init output buffer & size */ iRawlen = 11 + (30 * pPAST->iCount); - /* retquires large buffer ? */ + /* requires large buffer ? */ if (iRawlen > pData->iWritebufsize) MNG_ALLOC (pData, pRawdata, iRawlen) /* fill the output buffer */ diff --git a/src/3rdparty/libmng/libmng_cms.c b/src/3rdparty/libmng/libmng_cms.c index 081283fe..d072e371 100644 --- a/src/3rdparty/libmng/libmng_cms.c +++ b/src/3rdparty/libmng/libmng_cms.c @@ -243,7 +243,7 @@ mng_retcode init_full_cms (mng_datap pData) mng_uint8 iIntent; if (pData->bIssRGB) /* sRGB system ? */ - return MNG_NOERROR; /* no conversion retquired */ + return MNG_NOERROR; /* no conversion required */ if (!pData->hProf3) /* sRGB profile not defined ? */ { /* then create it implicitly !! */ @@ -435,7 +435,7 @@ mng_retcode init_full_cms_object (mng_datap pData) if (pBuf->bHasSRGB) { if (pData->bIssRGB) /* sRGB system ? */ - return MNG_NOERROR; /* no conversion retquired */ + return MNG_NOERROR; /* no conversion required */ if (!pData->hProf3) /* sRGB profile not defined ? */ { /* then create it implicitly !! */ diff --git a/src/3rdparty/libmng/libmng_conf.h b/src/3rdparty/libmng/libmng_conf.h index 28c17f70..c910786f 100644 --- a/src/3rdparty/libmng/libmng_conf.h +++ b/src/3rdparty/libmng/libmng_conf.h @@ -55,7 +55,7 @@ /* use this to select which (sub)set of the MNG specification you wish to support */ /* generally you'll want full support as the library provides it automatically - for you! if you're really strung on memory-retquirements you can opt + for you! if you're really strung on memory-requirements you can opt to enable less support (but it's just NOT a good idea!) */ /* NOTE that this isn't actually implemented yet */ @@ -67,9 +67,9 @@ /* ************************************************************************** */ -/* enable JPEG support if retquired */ +/* enable JPEG support if required */ /* use this to enable the JNG support routines */ -/* this retquires an external jpeg package; +/* this requires an external jpeg package; currently only IJG's jpgsrc6b is supported! */ /* NOTE that the IJG code can be either 8- or 12-bit (eg. not both); so choose the one you've defined in jconfig.h; if you don't know what @@ -90,7 +90,7 @@ /* #define MNG_SUPPORT_JPEG12 */ #endif -/* The following is retquired to export the IJG routines from the DLL in +/* The following is required to export the IJG routines from the DLL in the Windows-standard calling convention; currently this only works for Borland C++ !!! */ @@ -102,8 +102,8 @@ /* ************************************************************************** */ -/* enable retquired high-level functions */ -/* use this to select the high-level functions you retquire */ +/* enable required high-level functions */ +/* use this to select the high-level functions you require */ /* if you only need to display a MNG, disable write support! */ /* if you only need to examine a MNG, disable write & display support! */ /* if you only need to copy a MNG, disable display support! */ @@ -123,7 +123,7 @@ /* enable chunk access functions */ /* use this to select whether you need access to the individual chunks */ /* useful if you want to examine a read MNG (you'll also need MNG_STORE_CHUNKS !)*/ -/* retquired if you need to create & write a new MNG! */ +/* required if you need to create & write a new MNG! */ #ifndef MNG_ACCESS_CHUNKS #if defined(MNG_BUILD_SO) || defined(MNG_USE_SO) || defined(MNG_BUILD_DLL) || defined(MNG_USE_DLL) @@ -135,7 +135,7 @@ /* enable exactly one of the color-management-functionality selectors */ /* use this to select the level of automatic color support */ -/* MNG_FULL_CMS retquires the lcms (little cms) external package ! */ +/* MNG_FULL_CMS requires the lcms (little cms) external package ! */ /* if you want your own app (or the OS) to handle color-management select MNG_APP_CMS */ diff --git a/src/3rdparty/libmng/libmng_data.h b/src/3rdparty/libmng/libmng_data.h index 28c3a1df..e881ce1a 100644 --- a/src/3rdparty/libmng/libmng_data.h +++ b/src/3rdparty/libmng/libmng_data.h @@ -410,7 +410,7 @@ typedef struct mng_data_struct { mng_uint32 iRequesttime; mng_bool bSearching; - mng_bool bRestorebkgd; /* flags restore retquired before IDAT/JDAT */ + mng_bool bRestorebkgd; /* flags restore required before IDAT/JDAT */ mng_uint32 iRuntime; /* millisecs since start */ mng_uint32 iSynctime; /* tickcount at last framesync */ diff --git a/src/3rdparty/libmng/libmng_display.c b/src/3rdparty/libmng/libmng_display.c index 544fb406..d2e460cd 100644 --- a/src/3rdparty/libmng/libmng_display.c +++ b/src/3rdparty/libmng/libmng_display.c @@ -482,7 +482,7 @@ mng_retcode load_bkgdlayer (mng_datap pData) /* TODO: determine color correction; this is tricky; the BACK color is treated differently as the image; - it probably retquires a rewrite of the logic here... */ + it probably requires a rewrite of the logic here... */ /* get a temporary row-buffer */ @@ -626,7 +626,7 @@ mng_retcode next_frame (mng_datap pData, if (!pData->iBreakpoint) /* no previous break here ? */ { mng_uint8 iOldmode = pData->iFramemode; - /* interframe delay retquired ? */ + /* interframe delay required ? */ if ((iOldmode == 2) || (iOldmode == 4)) { /* changed here because FRAM 1/3 will delay themselves before each image */ @@ -768,7 +768,7 @@ mng_retcode next_layer (mng_datap pData) #endif if (!pData->iBreakpoint) /* no previous break here ? */ - { /* interframe delay retquired ? */ + { /* interframe delay required ? */ if ((pData->eImagetype == mng_it_mng) && (pData->iLayerseq) && ((pData->iFramemode == 1) || (pData->iFramemode == 3))) iRetcode = interframe_delay (pData); diff --git a/src/3rdparty/libmng/libmng_error.c b/src/3rdparty/libmng/libmng_error.c index a834ecd9..b3e42180 100644 --- a/src/3rdparty/libmng/libmng_error.c +++ b/src/3rdparty/libmng/libmng_error.c @@ -75,7 +75,7 @@ {MNG_NOERROR, "No error"}, {MNG_OUTOFMEMORY, "Out of memory"}, {MNG_INVALIDHANDLE, "The handle is invalid"}, - {MNG_NOCALLBACK, "A retquired callback is not defined"}, + {MNG_NOCALLBACK, "A required callback is not defined"}, {MNG_UNEXPECTEDEOF, "Encountered unexpected end-of-file"}, {MNG_ZLIBERROR, "zlib encountered an error"}, {MNG_JPEGERROR, "ijgsrc6b encountered an error"}, diff --git a/src/3rdparty/libmng/libmng_jpeg.c b/src/3rdparty/libmng/libmng_jpeg.c index a4e55013..dba8bf56 100644 --- a/src/3rdparty/libmng/libmng_jpeg.c +++ b/src/3rdparty/libmng/libmng_jpeg.c @@ -596,7 +596,7 @@ mng_retcode mngjpeg_decompressdata (mng_datap pData, { pData->bJPEGscanstarted = MNG_TRUE; - /* adjust output decompression parameters if retquired */ + /* adjust output decompression parameters if required */ /* nop */ /* start a new output pass */ @@ -932,7 +932,7 @@ mng_retcode mngjpeg_decompressdata2 (mng_datap pData, { pData->bJPEGscanstarted2 = MNG_TRUE; - /* adjust output decompression parameters if retquired */ + /* adjust output decompression parameters if required */ /* nop */ /* start a new output pass */ diff --git a/src/3rdparty/libmng/libmng_object_prc.c b/src/3rdparty/libmng/libmng_object_prc.c index 4d481374..6915db85 100644 --- a/src/3rdparty/libmng/libmng_object_prc.c +++ b/src/3rdparty/libmng/libmng_object_prc.c @@ -1536,7 +1536,7 @@ mng_retcode process_ani_image (mng_datap pData, if (iRetcode) /* on error bail out */ return iRetcode; } - /* now go and shoot it off (if retquired) */ + /* now go and shoot it off (if required) */ if ((pDelta->bVisible) && (pDelta->bViewable)) iRetcode = display_image (pData, pDelta, MNG_FALSE); @@ -1576,7 +1576,7 @@ mng_retcode process_ani_image (mng_datap pData, MNG_COPY (pBuf->pProfile, pImage->pImgbuf->pProfile, pBuf->iProfilesize) } } - /* now go and shoot it off (if retquired) */ + /* now go and shoot it off (if required) */ if ((pCurrent->bVisible) && (pCurrent->bViewable)) iRetcode = display_image (pData, pCurrent, MNG_FALSE); } @@ -3187,7 +3187,7 @@ mng_retcode process_ani_term (mng_datap pData, MNG_TRACE (pData, MNG_FN_PROCESS_ANI_TERM, MNG_LC_START) #endif - /* dummy: no action retquired! */ + /* dummy: no action required! */ #ifdef MNG_SUPPORT_TRACE MNG_TRACE (pData, MNG_FN_PROCESS_ANI_TERM, MNG_LC_END) diff --git a/src/3rdparty/libmng/libmng_pixels.c b/src/3rdparty/libmng/libmng_pixels.c index 8192a80b..73792172 100644 --- a/src/3rdparty/libmng/libmng_pixels.c +++ b/src/3rdparty/libmng/libmng_pixels.c @@ -1919,11 +1919,11 @@ mng_retcode restore_bkgd_bgr8 (mng_datap pData) /* ************************************************************************** */ /* TODO: a serious optimization is to retrieve only those pixels that will - actually be displayed; this would retquire changes in + actually be displayed; this would require changes in the "display_image" routine (in mng_display.c) & all the "retrieve_xxx" routines below & the "display_xxx" routines above !!!!! - NOTE that "correct_xxx" routines would not retquire modification */ + NOTE that "correct_xxx" routines would not require modification */ mng_retcode retrieve_g8 (mng_datap pData) { @@ -8237,7 +8237,7 @@ mng_retcode init_rowproc (mng_datap pData) } /* allocate the buffers; the individual init routines have already - calculated the retquired maximum size; except in the case of a JNG + calculated the required maximum size; except in the case of a JNG without alpha!!! */ if (pData->iRowmax) { diff --git a/src/3rdparty/libmng/libmng_read.c b/src/3rdparty/libmng/libmng_read.c index d4fb2d1a..778e5d0a 100644 --- a/src/3rdparty/libmng/libmng_read.c +++ b/src/3rdparty/libmng/libmng_read.c @@ -166,7 +166,7 @@ mng_retcode read_databuffer (mng_datap pData, } else { - if (iTemp < iRemain) /* suspension retquired ? */ + if (iTemp < iRemain) /* suspension required ? */ { pData->pReadbufnext = pData->pReadbufnext + iTemp; pData->bSuspended = MNG_TRUE; @@ -216,7 +216,7 @@ mng_retcode read_databuffer (mng_datap pData, pData->iSuspendbufleft = 0; } else - { /* suspension retquired ? */ + { /* suspension required ? */ if ((iSize > pData->iSuspendbufleft) && (iTemp < MNG_SUSPENDRETQUESTSIZE)) pData->bSuspended = MNG_TRUE; @@ -240,7 +240,7 @@ mng_retcode read_databuffer (mng_datap pData, { if (!pData->fReaddata (((mng_handle)pData), (mng_ptr)pBuf, iSize, iRead)) { - if (*iRead == 0) /* suspension retquired ? */ + if (*iRead == 0) /* suspension required ? */ pData->bSuspended = MNG_TRUE; else MNG_ERROR (pData, MNG_APPIOERROR); diff --git a/src/3rdparty/libmng/libmng_types.h b/src/3rdparty/libmng/libmng_types.h index e621f2c9..aa346d30 100644 --- a/src/3rdparty/libmng/libmng_types.h +++ b/src/3rdparty/libmng/libmng_types.h @@ -209,7 +209,7 @@ /* * * */ /* ************************************************************************** */ -/* TODO: this may retquire some elaboration for other platforms; +/* TODO: this may require some elaboration for other platforms; only works with BCB for now */ #ifndef MNG_DLL diff --git a/src/3rdparty/libmng/ltmain.sh b/src/3rdparty/libmng/ltmain.sh index 663ed35d..59b9650b 100644 --- a/src/3rdparty/libmng/ltmain.sh +++ b/src/3rdparty/libmng/ltmain.sh @@ -200,7 +200,7 @@ do done if test -n "$prevopt"; then - $echo "$modename: option \`$prevopt' retquires an argument" 1>&2 + $echo "$modename: option \`$prevopt' requires an argument" 1>&2 $echo "$help" 1>&2 exit 1 fi @@ -1073,7 +1073,7 @@ compiler." -no-install) case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - # The PATH hackery in wrapper scripts is retquired on Windows + # The PATH hackery in wrapper scripts is required on Windows # in order for the loader to find any dlls it needs. $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2 $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2 @@ -1272,7 +1272,7 @@ compiler." done # argument parsing loop if test -n "$prev"; then - $echo "$modename: the \`$prevarg' option retquires an argument" 1>&2 + $echo "$modename: the \`$prevarg' option requires an argument" 1>&2 $echo "$help" 1>&2 exit 1 fi @@ -1633,7 +1633,7 @@ compiler." exit 1 fi # Prefer using a static library (so that no silly _DYNAMIC symbols - # are retquired to link). + # are required to link). if test -n "$old_library"; then newdlprefiles="$newdlprefiles $dir/$old_library" # Otherwise, use the dlname, so that lt_dlopen finds it. @@ -2147,7 +2147,7 @@ compiler." exit 1 fi if test "$need_lib_prefix" != no; then - # Add the "lib" prefix for modules if retquired + # Add the "lib" prefix for modules if required name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` eval libname=\"$libname_spec\" else @@ -3396,7 +3396,7 @@ static const void *lt_preloaded_setup() { else # We keep going just in case the user didn't refer to # lt_preloaded_symbols. The linker will fail if global_symbol_pipe - # really was retquired. + # really was required. # Nullify the symbol file. compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` @@ -4054,7 +4054,7 @@ relink_command=\"$relink_command\"" fi if test -n "$prev"; then - $echo "$modename: the \`$prev' option retquires an argument" 1>&2 + $echo "$modename: the \`$prev' option requires an argument" 1>&2 $echo "$help" 1>&2 exit 1 fi @@ -4873,7 +4873,7 @@ This mode sets the library path environment variable according to \`-dlopen' flags. If any of the ARGS are libtool executable wrappers, then they are translated -into their corresponding uninstalled binary, and any of their retquired library +into their corresponding uninstalled binary, and any of their required library directories are added to the library path. Then, COMMAND is executed, with ARGS as arguments." @@ -4887,7 +4887,7 @@ Complete the installation of libtool libraries. Each LIBDIR is a directory that contains libtool libraries. -The commands that this mode executes may retquire superuser privileges. Use +The commands that this mode executes may require superuser privileges. Use the \`--dry-run' option if you just want to see what would be executed." ;; @@ -4925,8 +4925,8 @@ The following components of LINK-COMMAND are treated specially: try to export only the symbols listed in SYMFILE -export-symbols-regex REGEX try to export only the symbols matching REGEX - -LLIBDIR search LIBDIR for retquired installed libraries - -lNAME OUTPUT-FILE retquires the installed library libNAME + -LLIBDIR search LIBDIR for required installed libraries + -lNAME OUTPUT-FILE requires the installed library libNAME -module build a library that can dlopened -no-fast-install disable the fast-install mode -no-install link a not-installable executable @@ -4947,7 +4947,7 @@ object files. If the OUTPUT-FILE ends in \`.la', then a libtool library is created, only library objects (\`.lo' files) may be specified, and \`-rpath' is -retquired, except when creating a convenience library. +required, except when creating a convenience library. If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created using \`ar' and \`ranlib', or on Windows using \`lib'. diff --git a/src/3rdparty/libmng/makefiles/configure.in b/src/3rdparty/libmng/makefiles/configure.in index 4b0c85c3..511b3633 100644 --- a/src/3rdparty/libmng/makefiles/configure.in +++ b/src/3rdparty/libmng/makefiles/configure.in @@ -23,7 +23,7 @@ AC_PROG_INSTALL dnl support for files >2GB AC_SYS_LARGEFILE -dnl Check for retquired header files +dnl Check for required header files AC_HEADER_STDC dnl Checks for typedefs, structures, and compiler characteristics. @@ -89,7 +89,7 @@ dnl this should always be on AC_DEFINE(MNG_ERROR_TELLTALE) -dnl libz is retquired. +dnl libz is required. AC_ARG_WITH(zlib, [ --with-zlib[=DIR] use zlib include/library files in DIR],[ if test -d "$withval"; then diff --git a/src/3rdparty/libmng/missing b/src/3rdparty/libmng/missing index 37d24565..d46f79f6 100755 --- a/src/3rdparty/libmng/missing +++ b/src/3rdparty/libmng/missing @@ -188,7 +188,7 @@ WARNING: \`$1' is missing on your system. You should only need it if WARNING: \`$1' is needed, and you do not seem to have it handy on your system. You might have modified some files without having the proper tools for further handling them. Check the \`README' file, - it often tells you about the needed preretquirements for installing + it often tells you about the needed prerequirements for installing this package. You may also peek at any GNU archive site, in case some other package would contain this missing \`$1' program." exit 1 |