diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-05 22:04:08 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-05 22:04:08 -0600 |
| commit | e02e31c8b9d854cd62cbe9799228f6e08e882773 (patch) | |
| tree | 53303c981d0b20e03c5a2fc8e959fa74adcb90d1 /src/3rdparty | |
| parent | 143f194af098d44bf0dd1ebb29e59f30ce48d523 (diff) | |
| download | tqt3-e02e31c8b9d854cd62cbe9799228f6e08e882773.tar.gz tqt3-e02e31c8b9d854cd62cbe9799228f6e08e882773.zip | |
Sync with latest script
Diffstat (limited to 'src/3rdparty')
112 files changed, 371 insertions, 371 deletions
diff --git a/src/3rdparty/libjpeg/README b/src/3rdparty/libjpeg/README index d1a57612a..bf58bdd3d 100644 --- a/src/3rdparty/libjpeg/README +++ b/src/3rdparty/libjpeg/README @@ -91,7 +91,7 @@ considerable functionality beyond the bare JPEG coding/decoding capability; for example, the color quantization modules are not strictly part of JPEG decoding, but they are essential for output to colormapped file formats or colormapped displays. These extra functions can be compiled out of the -library if not retquired for a particular application. We have also included +library if not required for a particular application. We have also included "jpegtran", a utility for lossless transcoding between different JPEG processes, and "rdjpgcom" and "wrjpgcom", two simple applications for inserting and extracting textual comments in JFIF files. @@ -104,7 +104,7 @@ be reliable, portable, industrial-strength code. We do not claim to have achieved that goal in every aspect of the software, but we strive for it. We welcome the use of this software as a component of commercial products. -No royalty is retquired, but we do ask for an acknowledgement in product +No royalty is required, but we do ask for an acknowledgement in product documentation, as described under LEGAL ISSUES. @@ -189,7 +189,7 @@ been removed altogether, and the GIF writer has been simplified to produce resulting GIF files are larger than usual, but are readable by all standard GIF decoders. -We are retquired to state that +We are required to state that "The Graphics Interchange Format(c) is the Copyright property of CompuServe Incorporated. GIF(sm) is a Service Mark property of CompuServe Incorporated." diff --git a/src/3rdparty/libjpeg/change.log b/src/3rdparty/libjpeg/change.log index 9cc6ce772..74102c0db 100644 --- a/src/3rdparty/libjpeg/change.log +++ b/src/3rdparty/libjpeg/change.log @@ -71,7 +71,7 @@ Version 6a 7-Feb-96 Library initialization sequence modified to detect version mismatches and struct field packing mismatches between library and calling application. -This change retquires applications to be recompiled, but does not retquire +This change requires applications to be recompiled, but does not require any application source code change. All routine declarations changed to the style "GLOBAL(type) name ...", diff --git a/src/3rdparty/libjpeg/coderules.doc b/src/3rdparty/libjpeg/coderules.doc index aa87d6ad4..0ab5d9bd3 100644 --- a/src/3rdparty/libjpeg/coderules.doc +++ b/src/3rdparty/libjpeg/coderules.doc @@ -39,7 +39,7 @@ source code by using macros to substitute shorter names.) We use function prototypes everywhere; we rely on automatic source code transformation to feed prototype-less C compilers. Transformation is done by the simple and portable tool 'ansi2knr.c' (courtesy of Ghostscript). -ansi2knr is not very bright, so it imposes a format retquirement on function +ansi2knr is not very bright, so it imposes a format requirement on function declarations: the function name MUST BEGIN IN COLUMN 1. Thus all functions should be written in the following style: @@ -85,7 +85,7 @@ so that the result is guaranteed to be of type size_t. The JPEG library is intended to be used within larger programs. Furthermore, we want it to be reentrant so that it can be used by applications that process -multiple images concurrently. The following rules support these retquirements: +multiple images concurrently. The following rules support these requirements: 1. Avoid direct use of file I/O, "malloc", error report printouts, etc; pass these through the common routines provided. diff --git a/src/3rdparty/libjpeg/jcapistd.c b/src/3rdparty/libjpeg/jcapistd.c index 0d43c0575..c0320b1b1 100644 --- a/src/3rdparty/libjpeg/jcapistd.c +++ b/src/3rdparty/libjpeg/jcapistd.c @@ -23,7 +23,7 @@ * Compression initialization. * Before calling this, all parameters and a data destination must be set up. * - * We retquire a write_all_tables parameter as a failsafe check when writing + * We require a write_all_tables parameter as a failsafe check when writing * multiple datastreams from the same compression object. Since prior runs * will have left all the tables marked sent_table=TRUE, a subsequent run * would emit an abbreviated stream (no tables) by default. This may be what diff --git a/src/3rdparty/libjpeg/jccolor.c b/src/3rdparty/libjpeg/jccolor.c index c3f0f8dcc..0a8a4b5d1 100644 --- a/src/3rdparty/libjpeg/jccolor.c +++ b/src/3rdparty/libjpeg/jccolor.c @@ -123,7 +123,7 @@ rgb_ycc_start (j_compress_ptr cinfo) * * A starting row offset is provided only for the output buffer. The caller * can easily adjust the passed input_buf value to accommodate any row - * offset retquired on that side. + * offset required on that side. */ METHODDEF(void) diff --git a/src/3rdparty/libjpeg/jchuff.c b/src/3rdparty/libjpeg/jchuff.c index 45540e607..f23525054 100644 --- a/src/3rdparty/libjpeg/jchuff.c +++ b/src/3rdparty/libjpeg/jchuff.c @@ -677,7 +677,7 @@ encode_mcu_gather (j_compress_ptr cinfo, JBLOCKROW *MCU_data) * Generate the best Huffman code table for the given counts, fill htbl. * Note this is also used by jcphuff.c. * - * The JPEG standard retquires that no symbol be assigned a codeword of all + * The JPEG standard requires that no symbol be assigned a codeword of all * one bits (so that padding bits added at the end of a compressed segment * can't look like a valid code). Because of the canonical ordering of * codewords, this just means that there must be an unused slot in the @@ -689,7 +689,7 @@ encode_mcu_gather (j_compress_ptr cinfo, JBLOCKROW *MCU_data) * practice, because it produces more all-ones bytes (which incur stuffed * zero bytes in the final file). In any case the difference is tiny. * - * The JPEG standard retquires Huffman codes to be no more than 16 bits long. + * The JPEG standard requires Huffman codes to be no more than 16 bits long. * If some symbols have a very small but nonzero probability, the Huffman tree * must be adjusted to meet the code length restriction. We currently use * the adjustment method suggested in JPEG section K.2. This method is *not* diff --git a/src/3rdparty/libjpeg/jcmarker.c b/src/3rdparty/libjpeg/jcmarker.c index 7f5c271f0..4c4cf14a7 100644 --- a/src/3rdparty/libjpeg/jcmarker.c +++ b/src/3rdparty/libjpeg/jcmarker.c @@ -582,7 +582,7 @@ write_scan_header (j_compress_ptr cinfo) } } - /* Emit DRI if retquired --- note that DRI value could change for each scan. + /* Emit DRI if required --- note that DRI value could change for each scan. * We avoid wasting space with unnecessary DRIs, however. */ if (cinfo->restart_interval != marker->last_restart_interval) { diff --git a/src/3rdparty/libjpeg/jcmaster.c b/src/3rdparty/libjpeg/jcmaster.c index 3b924912c..aab4020b8 100644 --- a/src/3rdparty/libjpeg/jcmaster.c +++ b/src/3rdparty/libjpeg/jcmaster.c @@ -243,7 +243,7 @@ validate_script (j_compress_ptr cinfo) if (cinfo->progressive_mode) { #ifdef C_PROGRESSIVE_SUPPORTED /* For progressive mode, we only check that at least some DC data - * got sent for each component; the spec does not retquire that all bits + * got sent for each component; the spec does not require that all bits * of all coefficients be transmitted. Would it be wiser to enforce * transmission of all coefficient bits?? */ @@ -394,7 +394,7 @@ per_scan_setup (j_compress_ptr cinfo) * This is called at the beginning of each pass. We determine which modules * will be active during this pass and give them appropriate start_pass calls. * We also set is_last_pass to indicate whether any more passes will be - * retquired. + * required. */ METHODDEF(void) diff --git a/src/3rdparty/libjpeg/jconfig.doc b/src/3rdparty/libjpeg/jconfig.doc index 4d739bb59..c18d1c064 100644 --- a/src/3rdparty/libjpeg/jconfig.doc +++ b/src/3rdparty/libjpeg/jconfig.doc @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file documents the configuration options that are retquired to + * This file documents the configuration options that are required to * customize the JPEG software for a particular system. * * The actual configuration options for a particular installation are stored diff --git a/src/3rdparty/libjpeg/jconfig.manx b/src/3rdparty/libjpeg/jconfig.manx index c09b9198e..6dd0d008e 100644 --- a/src/3rdparty/libjpeg/jconfig.manx +++ b/src/3rdparty/libjpeg/jconfig.manx @@ -38,6 +38,6 @@ #undef DONT_USE_B_MODE #undef PROGRESS_REPORT /* optional */ -#define signal_catcher _abort /* hack for Aztec C naming retquirements */ +#define signal_catcher _abort /* hack for Aztec C naming requirements */ #endif /* JPEG_CJPEG_DJPEG */ diff --git a/src/3rdparty/libjpeg/jconfig.st b/src/3rdparty/libjpeg/jconfig.st index b5f10f62c..4421b7a1a 100644 --- a/src/3rdparty/libjpeg/jconfig.st +++ b/src/3rdparty/libjpeg/jconfig.st @@ -33,7 +33,7 @@ #define TWO_FILE_COMMANDLINE /* optional -- undef if you like Unix style */ /* Note: if you undef TWO_FILE_COMMANDLINE, you may need to define - * USE_SETMODE. Some Atari compilers retquire it, some do not. + * USE_SETMODE. Some Atari compilers require it, some do not. */ #define NEED_SIGNAL_CATCHER /* needed if you use jmemname.c */ #undef DONT_USE_B_MODE diff --git a/src/3rdparty/libjpeg/jcphuff.c b/src/3rdparty/libjpeg/jcphuff.c index 4ad2db223..07f9178b0 100644 --- a/src/3rdparty/libjpeg/jcphuff.c +++ b/src/3rdparty/libjpeg/jcphuff.c @@ -399,7 +399,7 @@ encode_mcu_DC_first (j_compress_ptr cinfo, JBLOCKROW *MCU_data) ci = cinfo->MCU_membership[blkn]; compptr = cinfo->cur_comp_info[ci]; - /* Compute the DC value after the retquired point transform by Al. + /* Compute the DC value after the required point transform by Al. * This is simply an arithmetic right shift. */ temp2 = IRIGHT_SHIFT((int) ((*block)[0]), Al); @@ -669,7 +669,7 @@ encode_mcu_AC_refine (j_compress_ptr cinfo, JBLOCKROW *MCU_data) continue; } - /* Emit any retquired ZRLs, but not if they can be folded into EOB */ + /* Emit any required ZRLs, but not if they can be folded into EOB */ while (r > 15 && k <= EOB) { /* emit any pending EOBRUN and the BE correction bits */ emit_eobrun(entropy); diff --git a/src/3rdparty/libjpeg/jcprepct.c b/src/3rdparty/libjpeg/jcprepct.c index 5c7ad6c08..fa93333db 100644 --- a/src/3rdparty/libjpeg/jcprepct.c +++ b/src/3rdparty/libjpeg/jcprepct.c @@ -10,7 +10,7 @@ * and edge expansion steps. * * Most of the complexity here is associated with buffering input rows - * as retquired by the downsampler. See the comments at the head of + * as required by the downsampler. See the comments at the head of * jcsample.c for the downsampler's needs. */ diff --git a/src/3rdparty/libjpeg/jcsample.c b/src/3rdparty/libjpeg/jcsample.c index eb31d3648..212ec8757 100644 --- a/src/3rdparty/libjpeg/jcsample.c +++ b/src/3rdparty/libjpeg/jcsample.c @@ -285,7 +285,7 @@ h2v2_downsample (j_compress_ptr cinfo, jpeg_component_info * compptr, /* * Downsample pixel values of a single component. * This version handles the standard case of 2:1 horizontal and 2:1 vertical, - * with smoothing. One row of context is retquired. + * with smoothing. One row of context is required. */ METHODDEF(void) @@ -385,7 +385,7 @@ h2v2_smooth_downsample (j_compress_ptr cinfo, jpeg_component_info * compptr, /* * Downsample pixel values of a single component. * This version handles the special case of a full-size component, - * with smoothing. One row of context is retquired. + * with smoothing. One row of context is required. */ METHODDEF(void) diff --git a/src/3rdparty/libjpeg/jdapimin.c b/src/3rdparty/libjpeg/jdapimin.c index d19358876..409903a1b 100644 --- a/src/3rdparty/libjpeg/jdapimin.c +++ b/src/3rdparty/libjpeg/jdapimin.c @@ -230,7 +230,7 @@ default_decompress_parms (j_decompress_ptr cinfo) * requests suspension of the decompressor. In this case the application * should load more source data and then re-call jpeg_read_header to resume * processing. - * If a non-suspending data source is used and retquire_image is TRUE, then the + * If a non-suspending data source is used and require_image is TRUE, then the * return code need not be inspected since only JPEG_HEADER_OK is possible. * * This routine is now just a front end to jpeg_consume_input, with some @@ -238,7 +238,7 @@ default_decompress_parms (j_decompress_ptr cinfo) */ GLOBAL(int) -jpeg_read_header (j_decompress_ptr cinfo, boolean retquire_image) +jpeg_read_header (j_decompress_ptr cinfo, boolean require_image) { int retcode; @@ -253,9 +253,9 @@ jpeg_read_header (j_decompress_ptr cinfo, boolean retquire_image) retcode = JPEG_HEADER_OK; break; case JPEG_REACHED_EOI: - if (retquire_image) /* Complain if application wanted an image */ + if (require_image) /* Complain if application wanted an image */ ERREXIT(cinfo, JERR_NO_IMAGE); - /* Reset to start state; it would be safer to retquire the application to + /* Reset to start state; it would be safer to require the application to * call jpeg_abort, but we can't change it now for compatibility reasons. * A side effect is to free any temporary memory (there shouldn't be any). */ @@ -272,7 +272,7 @@ jpeg_read_header (j_decompress_ptr cinfo, boolean retquire_image) /* - * Consume data in advance of what the decompressor retquires. + * Consume data in advance of what the decompressor requires. * This can be called at any time once the decompressor object has * been created and a data source has been set up. * diff --git a/src/3rdparty/libjpeg/jdapistd.c b/src/3rdparty/libjpeg/jdapistd.c index 3df768a97..d23a985e8 100644 --- a/src/3rdparty/libjpeg/jdapistd.c +++ b/src/3rdparty/libjpeg/jdapistd.c @@ -100,7 +100,7 @@ output_pass_setup (j_decompress_ptr cinfo) cinfo->output_scanline = 0; cinfo->global_state = DSTATE_PRESCAN; } - /* Loop over any retquired dummy passes */ + /* Loop over any required dummy passes */ while (cinfo->master->is_dummy_pass) { #ifdef TQUANT_2PASS_SUPPORTED /* Crank through the dummy pass */ @@ -255,7 +255,7 @@ jpeg_finish_output (j_decompress_ptr cinfo) if ((cinfo->global_state == DSTATE_SCANNING || cinfo->global_state == DSTATE_RAW_OK) && cinfo->buffered_image) { /* Terminate this pass. */ - /* We do not retquire the whole pass to have been completed. */ + /* We do not require the whole pass to have been completed. */ (*cinfo->master->finish_output_pass) (cinfo); cinfo->global_state = DSTATE_BUFPOST; } else if (cinfo->global_state != DSTATE_BUFPOST) { diff --git a/src/3rdparty/libjpeg/jdcolor.c b/src/3rdparty/libjpeg/jdcolor.c index 94ea3bf95..6c04dfe8a 100644 --- a/src/3rdparty/libjpeg/jdcolor.c +++ b/src/3rdparty/libjpeg/jdcolor.c @@ -113,7 +113,7 @@ build_ycc_rgb_table (j_decompress_ptr cinfo) * as wide as the input buffer. * A starting row offset is provided only for the input buffer. The caller * can easily adjust the passed output_buf value to accommodate any row - * offset retquired on that side. + * offset required on that side. */ METHODDEF(void) diff --git a/src/3rdparty/libjpeg/jdct.h b/src/3rdparty/libjpeg/jdct.h index ebaf73013..2fd3ffcda 100644 --- a/src/3rdparty/libjpeg/jdct.h +++ b/src/3rdparty/libjpeg/jdct.h @@ -68,7 +68,7 @@ typedef FAST_FLOAT FLOAT_MULT_TYPE; /* preferred floating type */ * Each IDCT routine is responsible for range-limiting its results and * converting them to unsigned form (0..MAXJSAMPLE). The raw outputs could * be quite far out of range if the input data is corrupt, so a bulletproof - * range-limiting step is retquired. We use a mask-and-table-lookup method + * range-limiting step is required. We use a mask-and-table-lookup method * to do the combined operations tquickly. See the comments with * prepare_range_limit_table (in jdmaster.c) for more info. */ diff --git a/src/3rdparty/libjpeg/jddctmgr.c b/src/3rdparty/libjpeg/jddctmgr.c index 28f7b039a..9d80fe9e9 100644 --- a/src/3rdparty/libjpeg/jddctmgr.c +++ b/src/3rdparty/libjpeg/jddctmgr.c @@ -67,7 +67,7 @@ typedef union { } multiplier_table; -/* The current scaled-IDCT routines retquire ISLOW-style multiplier tables, +/* The current scaled-IDCT routines require ISLOW-style multiplier tables, * so be sure to compile that code if either ISLOW or SCALING is requested. */ #ifdef DCT_ISLOW_SUPPORTED diff --git a/src/3rdparty/libjpeg/jdhuff.c b/src/3rdparty/libjpeg/jdhuff.c index a8587242b..d99f9e7ca 100644 --- a/src/3rdparty/libjpeg/jdhuff.c +++ b/src/3rdparty/libjpeg/jdhuff.c @@ -252,7 +252,7 @@ jpeg_make_d_derived_tbl (j_decompress_ptr cinfo, boolean isDC, int tblno, /* Validate symbols as being reasonable. * For AC tables, we make no check, but accept all byte values 0..255. - * For DC tables, we retquire the symbols to be in range 0..15. + * For DC tables, we require the symbols to be in range 0..15. * (Tighter bounds could be applied depending on the data depth and mode, * but this is sufficient to ensure safe decoding.) */ diff --git a/src/3rdparty/libjpeg/jdmainct.c b/src/3rdparty/libjpeg/jdmainct.c index c5db1489a..c9a48fe11 100644 --- a/src/3rdparty/libjpeg/jdmainct.c +++ b/src/3rdparty/libjpeg/jdmainct.c @@ -27,7 +27,7 @@ * * Postprocessor input data is counted in "row groups". A row group * is defined to be (v_samp_factor * DCT_scaled_size / min_DCT_scaled_size) - * sample rows of each component. (We retquire DCT_scaled_size values to be + * sample rows of each component. (We require DCT_scaled_size values to be * chosen such that these numbers are integers. In practice DCT_scaled_size * values will likely be powers of two, so we actually have the stronger * condition that DCT_scaled_size / min_DCT_scaled_size is an integer.) @@ -45,7 +45,7 @@ * * Depending on the vertical scaling algorithm used, the upsampler may need * access to the sample row(s) above and below its current input row group. - * The upsampler is retquired to set need_context_rows TRUE at global selection + * The upsampler is required to set need_context_rows TRUE at global selection * time if so. When need_context_rows is FALSE, this controller can simply * obtain one iMCU row at a time from the coefficient controller and dole it * out as row groups to the postprocessor. @@ -54,7 +54,7 @@ * passed to postprocessing contains at least one row group's worth of samples * above and below the row group(s) being processed. Note that the context * rows "above" the first passed row group appear at negative row offsets in - * the passed buffer. At the top and bottom of the image, the retquired + * the passed buffer. At the top and bottom of the image, the required * context rows are manufactured by duplicating the first or last real sample * row; this avoids having special cases in the upsampling inner loops. * @@ -90,7 +90,7 @@ * 0 0 * We read alternate iMCU rows using each master pointer; thus the last two * row groups of the previous iMCU row remain un-overwritten in the workspace. - * The pointer lists are set up so that the retquired context rows appear to + * The pointer lists are set up so that the required context rows appear to * be adjacent to the proper places when we pass the pointer lists to the * upsampler. * @@ -338,7 +338,7 @@ start_pass_main (j_decompress_ptr cinfo, J_BUF_MODE pass_mode) /* * Process some data. - * This handles the simple case where no context is retquired. + * This handles the simple case where no context is required. */ METHODDEF(void) diff --git a/src/3rdparty/libjpeg/jdmarker.c b/src/3rdparty/libjpeg/jdmarker.c index 58ea5b5df..048dfc7ae 100644 --- a/src/3rdparty/libjpeg/jdmarker.c +++ b/src/3rdparty/libjpeg/jdmarker.c @@ -189,7 +189,7 @@ typedef my_marker_reader * my_marker_ptr; * * Note that we don't bother to avoid duplicate trace messages if a * suspension occurs within marker parameters. Other side effects - * retquire more care. + * require more care. */ @@ -954,7 +954,7 @@ read_markers (j_decompress_ptr cinfo) /* Outer loop repeats once for each marker. */ for (;;) { /* Collect the marker proper, unless we already did. */ - /* NB: first_marker() enforces the retquirement that SOI appear first. */ + /* NB: first_marker() enforces the requirement that SOI appear first. */ if (cinfo->unread_marker == 0) { if (! cinfo->marker->saw_SOI) { if (! first_marker(cinfo)) @@ -1100,7 +1100,7 @@ read_markers (j_decompress_ptr cinfo) /* * Read a restart marker, which is expected to appear next in the datastream; * if the marker is not there, take appropriate recovery action. - * Returns FALSE if suspension is retquired. + * Returns FALSE if suspension is required. * * This is called by the entropy decoder after it has read an appropriate * number of MCUs. cinfo->unread_marker may be nonzero if the entropy decoder @@ -1156,7 +1156,7 @@ read_restart_marker (j_decompress_ptr cinfo) * Note that cinfo->unread_marker is treated as a marker appearing before * the current data-source input point; usually it should be reset to zero * before returning. - * Returns FALSE if suspension is retquired. + * Returns FALSE if suspension is required. * * This implementation is substantially constrained by wanting to treat the * input as a data stream; this means we can't back up. Therefore, we have @@ -1312,7 +1312,7 @@ jpeg_save_markers (j_decompress_ptr cinfo, int marker_code, length_limit = (unsigned int) maxlength; /* Choose processor routine to use. - * APP0/APP14 have special retquirements. + * APP0/APP14 have special requirements. */ if (length_limit) { processor = save_marker; diff --git a/src/3rdparty/libjpeg/jdpostct.c b/src/3rdparty/libjpeg/jdpostct.c index dadbbde35..e6838c734 100644 --- a/src/3rdparty/libjpeg/jdpostct.c +++ b/src/3rdparty/libjpeg/jdpostct.c @@ -10,7 +10,7 @@ * quantization/reduction steps; specifically, it controls the buffering * between upsample/color conversion and color quantization/reduction. * - * If no color quantization/reduction is retquired, then this module has no + * If no color quantization/reduction is required, then this module has no * work to do, and it just hands off to the upsample/color conversion code. * An integrated upsample/convert/quantize process would replace this module * entirely. diff --git a/src/3rdparty/libjpeg/jfdctint.c b/src/3rdparty/libjpeg/jfdctint.c index 3a9055c4c..0a78b64ae 100644 --- a/src/3rdparty/libjpeg/jfdctint.c +++ b/src/3rdparty/libjpeg/jfdctint.c @@ -65,7 +65,7 @@ * * The outputs of the first pass are scaled up by PASS1_BITS bits so that * they are represented to better-than-integral precision. These outputs - * retquire BITS_IN_JSAMPLE + PASS1_BITS + 3 bits; this fits in a 16-bit word + * require BITS_IN_JSAMPLE + PASS1_BITS + 3 bits; this fits in a 16-bit word * with the recommended scaling. (For 12-bit sample data, the intermediate * array is INT32 anyway.) * diff --git a/src/3rdparty/libjpeg/jidctint.c b/src/3rdparty/libjpeg/jidctint.c index a85e99959..1f5f39309 100644 --- a/src/3rdparty/libjpeg/jidctint.c +++ b/src/3rdparty/libjpeg/jidctint.c @@ -65,7 +65,7 @@ * * The outputs of the first pass are scaled up by PASS1_BITS bits so that * they are represented to better-than-integral precision. These outputs - * retquire BITS_IN_JSAMPLE + PASS1_BITS + 3 bits; this fits in a 16-bit word + * require BITS_IN_JSAMPLE + PASS1_BITS + 3 bits; this fits in a 16-bit word * with the recommended scaling. (To scale up 12-bit sample data further, an * intermediate INT32 array would be needed.) * diff --git a/src/3rdparty/libjpeg/jinclude.h b/src/3rdparty/libjpeg/jinclude.h index 981650f64..0a4f15146 100644 --- a/src/3rdparty/libjpeg/jinclude.h +++ b/src/3rdparty/libjpeg/jinclude.h @@ -25,7 +25,7 @@ * On an ANSI-conforming system it is sufficient to include <stddef.h>. * Otherwise, we get them from <stdlib.h> or <stdio.h>; we may have to * pull in <sys/types.h> as well. - * Note that the core JPEG library does not retquire <stdio.h>; + * Note that the core JPEG library does not require <stdio.h>; * only the default error handler and data source/destination modules do. * But we must pull it in because of the references to FILE in jpeglib.h. * You can remove those references if you want to compile without <stdio.h>. diff --git a/src/3rdparty/libjpeg/jmemmgr.c b/src/3rdparty/libjpeg/jmemmgr.c index 99146731a..d801b322d 100644 --- a/src/3rdparty/libjpeg/jmemmgr.c +++ b/src/3rdparty/libjpeg/jmemmgr.c @@ -51,12 +51,12 @@ extern char * getenv JPP((const char * name)); /* - * Many machines retquire storage alignment: longs must start on 4-byte + * Many machines require storage alignment: longs must start on 4-byte * boundaries, doubles on 8-byte boundaries, etc. On such machines, malloc() * always returns pointers that are multiples of the worst-case alignment - * retquirement, and we had better do so too. + * requirement, and we had better do so too. * There isn't any really portable way to determine the worst-case alignment - * retquirement. This module assumes that the alignment retquirement is + * requirement. This module assumes that the alignment requirement is * multiples of sizeof(ALIGN_TYPE). * By default, we define ALIGN_TYPE as double. This is necessary on some * workstations (where doubles really do need 8-byte alignment) and will work @@ -83,7 +83,7 @@ extern char * getenv JPP((const char * name)); * link pointer must be FAR on 80x86 machines. * Notice that the "real" header fields are union'ed with a dummy ALIGN_TYPE * field. This forces the compiler to make SIZEOF(small_pool_hdr) a multiple - * of the alignment retquirement of ALIGN_TYPE. + * of the alignment requirement of ALIGN_TYPE. */ typedef union small_pool_struct * small_pool_ptr; @@ -1036,7 +1036,7 @@ jinit_memory_mgr (j_common_ptr cinfo) /* Check for configuration errors. * SIZEOF(ALIGN_TYPE) should be a power of 2; otherwise, it probably - * doesn't reflect any real hardware alignment retquirement. + * doesn't reflect any real hardware alignment requirement. * The test is a little tricky: for X>0, X and X-1 have no one-bits * in common if and only if X is a power of 2, ie has only one one-bit. * Some compilers may give an "unreachable code" warning here; ignore it. diff --git a/src/3rdparty/libjpeg/jmemnobs.c b/src/3rdparty/libjpeg/jmemnobs.c index 4167b453b..eb8c33772 100644 --- a/src/3rdparty/libjpeg/jmemnobs.c +++ b/src/3rdparty/libjpeg/jmemnobs.c @@ -7,7 +7,7 @@ * * This file provides a really simple implementation of the system- * dependent portion of the JPEG memory manager. This implementation - * assumes that no backing-store files are needed: all retquired space + * assumes that no backing-store files are needed: all required space * can be obtained from malloc(). * This is very portable in the sense that it'll compile on almost anything, * but you'd better have lots of main memory (or virtual memory) if you want @@ -93,7 +93,7 @@ jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info, /* * These routines take care of any system-dependent initialization and - * cleanup retquired. Here, there isn't any. + * cleanup required. Here, there isn't any. */ GLOBAL(long) diff --git a/src/3rdparty/libjpeg/jmemsys.h b/src/3rdparty/libjpeg/jmemsys.h index 617f72f1d..6c3c6d348 100644 --- a/src/3rdparty/libjpeg/jmemsys.h +++ b/src/3rdparty/libjpeg/jmemsys.h @@ -83,7 +83,7 @@ EXTERN(void) jpeg_free_large JPP((j_common_ptr cinfo, void FAR * object, * jpeg_get_large. If more space than this is needed, backing store will be * used. NOTE: any memory already allocated must not be counted. * - * There is a minimum space retquirement, corresponding to the minimum + * There is a minimum space requirement, corresponding to the minimum * feasible buffer sizes; jmemmgr.c will request that much space even if * jpeg_mem_available returns zero. The maximum space needed, enough to hold * all working storage in memory, is also passed in case it is useful. @@ -184,7 +184,7 @@ EXTERN(void) jpeg_open_backing_store JPP((j_common_ptr cinfo, /* * These routines take care of any system-dependent initialization and - * cleanup retquired. jpeg_mem_init will be called before anything is + * cleanup required. jpeg_mem_init will be called before anything is * allocated (and, therefore, nothing in cinfo is of use except the error * manager pointer). It should return a suitable default value for * max_memory_to_use; this may subsequently be overridden by the surrounding diff --git a/src/3rdparty/libjpeg/jmorecfg.h b/src/3rdparty/libjpeg/jmorecfg.h index f4a1bd5dd..58dec612a 100644 --- a/src/3rdparty/libjpeg/jmorecfg.h +++ b/src/3rdparty/libjpeg/jmorecfg.h @@ -177,7 +177,7 @@ typedef unsigned int JDIMENSION; * You could modify them if you need to change function linkage conventions; * in particular, you'll need to do that to make the library a Windows DLL. * Another application is to make all functions global for use with debuggers - * or code profilers that retquire it. + * or code profilers that require it. */ /* a function called through method pointers: */ diff --git a/src/3rdparty/libjpeg/jpegint.h b/src/3rdparty/libjpeg/jpegint.h index 73d6f93a5..95b00d405 100644 --- a/src/3rdparty/libjpeg/jpegint.h +++ b/src/3rdparty/libjpeg/jpegint.h @@ -15,7 +15,7 @@ typedef enum { /* Operating modes for buffer controllers */ JBUF_PASS_THRU, /* Plain stripwise operation */ - /* Remaining modes retquire a full-image buffer to have been created */ + /* Remaining modes require a full-image buffer to have been created */ JBUF_SAVE_SOURCE, /* Run source subobject only, save output */ JBUF_CRANK_DEST, /* Run dest subobject only, using saved data */ JBUF_SAVE_AND_PASS /* Run both subobjects, save output */ diff --git a/src/3rdparty/libjpeg/jpeglib.h b/src/3rdparty/libjpeg/jpeglib.h index 9f1401e84..8a9631f1d 100644 --- a/src/3rdparty/libjpeg/jpeglib.h +++ b/src/3rdparty/libjpeg/jpeglib.h @@ -811,7 +811,7 @@ typedef JMETHOD(boolean, jpeg_marker_parser_method, (j_decompress_ptr cinfo)); /* Declarations for routines called by application. * The JPP macro hides prototype parameters from compilers that can't cope. - * Note JPP retquires double parentheses. + * Note JPP requires double parentheses. */ #ifdef HAVE_PROTOTYPES @@ -960,12 +960,12 @@ EXTERN(void) jpeg_write_tables JPP((j_compress_ptr cinfo)); /* Decompression startup: read start of JPEG datastream to see what's there */ EXTERN(int) jpeg_read_header JPP((j_decompress_ptr cinfo, - boolean retquire_image)); + boolean require_image)); /* Return value is one of: */ #define JPEG_SUSPENDED 0 /* Suspended due to lack of input data */ #define JPEG_HEADER_OK 1 /* Found valid image datastream */ #define JPEG_HEADER_TABLES_ONLY 2 /* Found valid table-specs-only datastream */ -/* If you pass retquire_image = TRUE (normal case), you need not check for +/* If you pass require_image = TRUE (normal case), you need not check for * a TABLES_ONLY return code; an abbreviated file will cause an error exit. * JPEG_SUSPENDED is only possible if you use a data source module that can * give a suspension return (the stdio source module doesn't). diff --git a/src/3rdparty/libjpeg/jquant1.c b/src/3rdparty/libjpeg/jquant1.c index 28e9e60df..89fbf7497 100644 --- a/src/3rdparty/libjpeg/jquant1.c +++ b/src/3rdparty/libjpeg/jquant1.c @@ -546,7 +546,7 @@ quantize_ord_dither (j_decompress_ptr cinfo, JSAMPARRAY input_buf, * Range-limiting need not be done explicitly, as we have extended * the colorindex table to produce the right answers for out-of-range * inputs. The maximum dither is +- MAXJSAMPLE; this sets the - * retquired amount of padding. + * required amount of padding. */ *output_ptr += colorindex_ci[GETJSAMPLE(*input_ptr)+dither[col_index]]; input_ptr += nc; @@ -671,7 +671,7 @@ quantize_fs_dither (j_decompress_ptr cinfo, JSAMPARRAY input_buf, */ cur = RIGHT_SHIFT(cur + errorptr[dir] + 8, 4); /* Form pixel value + error, and range-limit to 0..MAXJSAMPLE. - * The maximum error is +- MAXJSAMPLE; this sets the retquired size + * The maximum error is +- MAXJSAMPLE; this sets the required size * of the range_limit array. */ cur += GETJSAMPLE(*input_ptr); diff --git a/src/3rdparty/libjpeg/jquant2.c b/src/3rdparty/libjpeg/jquant2.c index 06671126c..24d3cc219 100644 --- a/src/3rdparty/libjpeg/jquant2.c +++ b/src/3rdparty/libjpeg/jquant2.c @@ -44,7 +44,7 @@ * * The second pass over the image maps each input pixel to the closest output * color (optionally after applying a Floyd-Steinberg dithering correction). - * This mapping is logically trivial, but making it go fast enough retquires + * This mapping is logically trivial, but making it go fast enough requires * considerable care. * * Heckbert-style quantizers vary a good deal in their policies for choosing @@ -215,7 +215,7 @@ typedef my_cquantizer * my_cquantize_ptr; * Prescan some rows of pixels. * In this module the prescan simply updates the histogram, which has been * initialized to zeroes by start_pass. - * An output_buf parameter is retquired by the method signature, but no data + * An output_buf parameter is required by the method signature, but no data * is actually output (in fact the buffer controller is probably passing a * NULL pointer). */ @@ -1015,7 +1015,7 @@ pass2_fs_dither (j_decompress_ptr cinfo, cur2 = error_limit[cur2]; /* Form pixel value + error, and range-limit to 0..MAXJSAMPLE. * The maximum error is +- MAXJSAMPLE (or less with error limiting); - * this sets the retquired size of the range_limit array. + * this sets the required size of the range_limit array. */ cur0 += GETJSAMPLE(inptr[0]); cur1 += GETJSAMPLE(inptr[1]); @@ -1269,7 +1269,7 @@ jinit_2pass_quantizer (j_decompress_ptr cinfo) } cquantize->needs_zeroed = TRUE; /* histogram is garbage now */ - /* Allocate storage for the completed colormap, if retquired. + /* Allocate storage for the completed colormap, if required. * We do this now since it is FAR storage and may affect * the memory manager's space calculations. */ diff --git a/src/3rdparty/libjpeg/libjpeg.doc b/src/3rdparty/libjpeg/libjpeg.doc index 95da39e78..d8fb38759 100644 --- a/src/3rdparty/libjpeg/libjpeg.doc +++ b/src/3rdparty/libjpeg/libjpeg.doc @@ -84,7 +84,7 @@ provides multiple implementations that cover most of the useful tradeoffs, ranging from very-high-quality down to fast-preview operation. On the compression side we have generally not provided low-quality choices, since compression is normally less time-critical. It should be understood that the -low-quality modes may not meet the JPEG standard's accuracy retquirements; +low-quality modes may not meet the JPEG standard's accuracy requirements; nonetheless, they are useful for viewers. A word about functions *not* provided by the library. We handle a subset of @@ -379,7 +379,7 @@ the compression cycle. 5. while (scan lines remain to be written) jpeg_write_scanlines(...); -Now write all the retquired image data by calling jpeg_write_scanlines() +Now write all the required image data by calling jpeg_write_scanlines() one or more times. You can pass one or more scanlines in each call, up to the total image height. In most applications it is convenient to pass just one or a few scanlines at a time. The expected format for the passed @@ -496,7 +496,7 @@ in either of two ways: This will return the object to an idle state, releasing any working memory. jpeg_abort() is allowed at any time after successful object creation. -Note that cleaning up the data destination, if retquired, is your +Note that cleaning up the data destination, if required, is your responsibility; neither of these routines will call term_destination(). (See "Compressed data handling", below, for more about that.) @@ -645,7 +645,7 @@ You will need output_width * output_components JSAMPLEs per scanline in your output buffer, and a total of output_height scanlines will be returned. Note: if you are using the JPEG library's internal memory manager to allocate -data buffers (as djpeg does), then the manager's protocol retquires that you +data buffers (as djpeg does), then the manager's protocol requires that you request large buffers *before* calling jpeg_start_decompress(). This is a little tricky since the output_XXX fields are not normally valid then. You can make them valid by calling jpeg_calc_output_dimensions() after setting the @@ -770,10 +770,10 @@ it will try to grab extended memory for temp files, and that space will NOT be freed automatically. See cjpeg.c or djpeg.c for an example signal handler. It may be worth pointing out that the core JPEG library does not actually -retquire the stdio library: only the default source/destination managers and +require the stdio library: only the default source/destination managers and error handler need it. You can use the library in a stdio-less environment if you replace those modules and use jmemnobs.c (or another memory manager of -your own devising). More info about the minimum system library retquirements +your own devising). More info about the minimum system library requirements may be found in jinclude.h. @@ -785,7 +785,7 @@ Compression parameter selection This section describes all the optional parameters you can set for JPEG compression, as well as the "helper" routines provided to assist in this -task. Proper setting of some parameters retquires detailed understanding +task. Proper setting of some parameters requires detailed understanding of the JPEG standard; if you don't know what a parameter is for, it's best not to mess with it! See REFERENCES in the README file for pointers to more info about JPEG. @@ -897,7 +897,7 @@ int num_components boolean optimize_coding TRUE causes the compressor to compute optimal Huffman coding tables - for the image. This retquires an extra pass over the data and + for the image. This requires an extra pass over the data and therefore costs a good deal of space and time. The default is FALSE, which tells the compressor to use the supplied or default Huffman tables. In most cases optimal tables save only a few percent @@ -1168,7 +1168,7 @@ int rec_outbuf_height Recommended height of scanline buffer. When quantizing colors, output_components is 1, indicating a single color map index per pixel. Otherwise it equals out_color_components. The output arrays -are retquired to be output_width * output_components JSAMPLEs wide. +are required to be output_width * output_components JSAMPLEs wide. rec_outbuf_height is the recommended minimum height (in scanlines) of the buffer passed to jpeg_read_scanlines(). If the buffer is smaller, the @@ -1568,7 +1568,7 @@ regenerated after resumption. Because of the backtracking behavior, a good-size output buffer is essential for efficiency; you don't want the compressor to suspend often. (In fact, an -overly small buffer could lead to infinite looping, if a single MCU retquired +overly small buffer could lead to infinite looping, if a single MCU required more data than would fit in the buffer.) We recommend a buffer of at least several Kbytes. You may want to insert explicit code to ensure that you don't call jpeg_write_scanlines() unless there is a reasonable amount of space in @@ -1624,7 +1624,7 @@ for decent performance; furthermore, you should load a reasonable amount of new data before resuming decompression. (If you loaded, say, only one new byte each time around, you could waste a LOT of cycles.) -The skip_input_data() source manager routine retquires special care in a +The skip_input_data() source manager routine requires special care in a suspension scenario. This routine is NOT granted the ability to suspend the decompressor; it can decrement bytes_in_buffer to zero, but no more. If the requested skip distance exceeds the amount of data currently in the input @@ -1693,7 +1693,7 @@ with the case of skipping not-yet-received data, however. It's much simpler to use only a single buffer; when fill_input_buffer() is called, move any unconsumed data (beyond the current pointer/count) down to the beginning of this buffer and then load new data into the remaining buffer -space. This approach retquires a little more data copying but is far easier +space. This approach requires a little more data copying but is far easier to get right. @@ -1721,7 +1721,7 @@ To perform incremental display, an application needs to use the decoder library's "buffered-image" mode, in which it receives a decoded image multiple times. -Each displayed scan retquires about as much work to decode as a full JPEG +Each displayed scan requires about as much work to decode as a full JPEG image of the same size, so the decoder must be fairly fast in relation to the data transmission rate in order to make incremental display useful. However, it is possible to skip displaying the image and simply add the incoming bits @@ -1791,7 +1791,7 @@ The basic control flow for buffered-image decoding is cinfo.buffered_image = TRUE; /* select buffered-image mode */ jpeg_start_decompress() for (each output pass) { - adjust output decompression parameters if retquired + adjust output decompression parameters if required jpeg_start_output() /* start a new output pass */ for (all scanlines in image) { jpeg_read_scanlines() @@ -1855,14 +1855,14 @@ immediately return JPEG_REACHED_EOI without attempting to read more data.) The library's output processing will automatically call jpeg_consume_input() whenever the output processing overtakes the input; thus, simple lockstep -display retquires no direct calls to jpeg_consume_input(). But by adding +display requires no direct calls to jpeg_consume_input(). But by adding calls to jpeg_consume_input(), you can absorb data in advance of what is being displayed. This has two benefits: * You can limit buildup of unprocessed data in your input buffer. * You can eliminate extra display passes by paying attention to the state of the library's input processing. -The first of these benefits only retquires interspersing calls to +The first of these benefits only requires interspersing calls to jpeg_consume_input() with your display operations and any other processing you may be doing. To avoid wasting cycles due to backtracking, it's best to call jpeg_consume_input() only after a hundred or so new bytes have arrived. @@ -1926,7 +1926,7 @@ something like this: do { absorb any waiting input by calling jpeg_consume_input() final_pass = jpeg_input_complete(&cinfo); - adjust output decompression parameters if retquired + adjust output decompression parameters if required jpeg_start_output(&cinfo, cinfo.input_scan_number); ... jpeg_finish_output() @@ -2029,7 +2029,7 @@ allowed after jpeg_start_decompress() is called: up on smooth gradients until the lowest coefficient bits are sent. * Color quantization mode can be changed under the rules described below. You *cannot* change between full-color and quantized output (because that - would alter the retquired I/O buffer sizes), but you can change which + would alter the required I/O buffer sizes), but you can change which quantization method is used. When generating color-quantized output, changing quantization method is a @@ -2048,9 +2048,9 @@ These methods offer successively better quality and lesser speed. However, only the first method is available for quantizing in non-RGB color spaces. IMPORTANT: because the different quantizer methods have very different -working-storage retquirements, the library retquires you to indicate which +working-storage requirements, the library requires you to indicate which one(s) you intend to use before you call jpeg_start_decompress(). (If we did -not retquire this, the max_memory_to_use setting would be a complete fiction.) +not require this, the max_memory_to_use setting would be a complete fiction.) You do this by setting one or more of these three cinfo fields to TRUE: enable_1pass_quant Fixed color cube colormap enable_external_quant Externally-supplied colormap @@ -2073,7 +2073,7 @@ special rules apply: NOTE: if you want to use the same colormap as was used in the prior pass, you should not do either of these things. This will save some nontrivial switchover costs. -(These retquirements exist because cinfo.colormap will always be non-NULL +(These requirements exist because cinfo.colormap will always be non-NULL after completing a prior output pass, since both the 1-pass and 2-pass quantizers set it to point to their output colormaps. Thus you have to do one of these two things to notify the library that something has changed. @@ -2269,7 +2269,7 @@ into it, as illustrated above. Ditto for Huffman tables, of course.) You might want to read the tables from a tables-only file, rather than hard-wiring them into your application. The jpeg_read_header() call is sufficient to read a tables-only file. You must pass a second parameter of -FALSE to indicate that you do not retquire an image to be present. Thus, the +FALSE to indicate that you do not require an image to be present. Thus, the typical scenario is create JPEG decompression object @@ -2474,7 +2474,7 @@ Raw (downsampled) image data Some applications need to supply already-downsampled image data to the JPEG compressor, or to receive raw downsampled data from the decompressor. The -library supports this retquirement by allowing the application to write or +library supports this requirement by allowing the application to write or read raw data, bypassing the normal preprocessing or postprocessing steps. The interface is different from the standard one and is somewhat harder to use. If your interest is merely in bypassing color conversion, we recommend @@ -2529,7 +2529,7 @@ be exactly that amount (or possibly some multiple of that amount, in future library versions). This is true even on the last call at the bottom of the image; don't forget to pad your data as necessary. -The retquired dimensions of the supplied data can be computed for each +The required dimensions of the supplied data can be computed for each component as cinfo->comp_info[i].width_in_blocks*DCTSIZE samples per row cinfo->comp_info[i].height_in_blocks*DCTSIZE rows in image @@ -2771,10 +2771,10 @@ Use alloc_large instead of alloc_small for anything bigger than a few Kbytes. There are also alloc_sarray and alloc_barray routines that automatically build 2-D sample or block arrays. -The library's minimum space retquirements to process an image depend on the +The library's minimum space requirements to process an image depend on the image's width, but not on its height, because the library ordinarily works with "strip" buffers that are as wide as the image but just a few rows high. -Some operating modes (eg, two-pass color quantization) retquire full-image +Some operating modes (eg, two-pass color quantization) require full-image buffers. Such buffers are treated as "virtual arrays": only the current strip need be in memory, and the rest can be swapped out to a temporary file. @@ -2801,7 +2801,7 @@ If you use the jmemname.c or jmemdos.c memory manager back end, it is important to clean up the JPEG object properly to ensure that the temporary files get deleted. (This is especially crucial with jmemdos.c, where the "temporary files" may be extended-memory segments; if they are not freed, -DOS will retquire a reboot to recover the memory.) Thus, with these memory +DOS will require a reboot to recover the memory.) Thus, with these memory managers, it's a good idea to provide a signal handler that will trap any early exit from your program. The handler should call either jpeg_abort() or jpeg_destroy() for any active JPEG objects. A handler is not needed with @@ -2813,11 +2813,11 @@ tmpfile(). Memory usage ------------ -Working memory retquirements while performing compression or decompression +Working memory requirements while performing compression or decompression depend on image dimensions, image characteristics (such as colorspace and JPEG process), and operating mode (application-selected options). -As of v6b, the decompressor retquires: +As of v6b, the decompressor requires: 1. About 24K in more-or-less-fixed-size data. This varies a bit depending on operating mode and image characteristics (particularly color vs. grayscale), but it doesn't depend on image dimensions. @@ -2828,7 +2828,7 @@ As of v6b, the decompressor retquires: 3. A full-image DCT coefficient buffer is needed to decode a multi-scan JPEG file (including progressive JPEGs), or whenever you select buffered-image mode. This takes 2 bytes/coefficient. At typical 2x2 sampling, that's - 3 bytes per pixel for a color image. Worst case (1x1 sampling) retquires + 3 bytes per pixel for a color image. Worst case (1x1 sampling) requires 6 bytes/pixel. For grayscale, figure 2 bytes/pixel. 4. To perform 2-pass color quantization, the decompressor also needs a 128K color lookup table and a full-image pixel buffer (3 bytes/pixel). @@ -2839,7 +2839,7 @@ The above figures are valid for 8-bit JPEG data precision and a machine with 32-bit ints. For 12-bit JPEG data, double the size of the strip buffers and quantization pixel buffer. The "fixed-size" data will be somewhat smaller with 16-bit ints, larger with 64-bit ints. Also, CMYK or other unusual -color spaces will retquire different amounts of space. +color spaces will require different amounts of space. The full-image coefficient and pixel buffers, if needed at all, do not have to be fully RAM resident; you can have the library use temporary @@ -2847,7 +2847,7 @@ files instead when the total memory usage would exceed a limit you set. (But if your OS supports virtual memory, it's probably better to just use jmemnobs and let the OS do the swapping.) -The compressor's memory retquirements are similar, except that it has no need +The compressor's memory requirements are similar, except that it has no need for color quantization. Also, it needs a full-image DCT coefficient buffer if Huffman-table optimization is asked for, even if progressive mode is not requested. @@ -2928,7 +2928,7 @@ distributed, we make the assumptions that short is at least 16 bits wide int is at least 16 bits wide long is at least 32 bits wide -(These are the minimum retquirements of the ANSI C standard.) Wider types will +(These are the minimum requirements of the ANSI C standard.) Wider types will work fine, although memory may be used inefficiently if char is much larger than 8 bits or short is much bigger than 16 bits. The code should work equally well with 16- or 32-bit ints. @@ -2996,7 +2996,7 @@ save a JPEG object between compression or decompression operations. Far data space may also be a tight resource when you are dealing with large images. The most memory-intensive case is decompression with two-pass color quantization, or single-pass quantization to an externally supplied color -map. This retquires a 128Kb color lookup table plus strip buffers amounting +map. This requires a 128Kb color lookup table plus strip buffers amounting to about 40 bytes per column for typical sampling ratios (eg, about 25600 bytes for a 640-pixel-wide image). You may not be able to process wide images if you have large data structures of your own. diff --git a/src/3rdparty/libjpeg/structure.doc b/src/3rdparty/libjpeg/structure.doc index b9b20cc83..51c9def7e 100644 --- a/src/3rdparty/libjpeg/structure.doc +++ b/src/3rdparty/libjpeg/structure.doc @@ -81,13 +81,13 @@ provides multiple implementations that cover most of the useful tradeoffs, ranging from very-high-quality down to fast-preview operation. On the compression side we have generally not provided low-quality choices, since compression is normally less time-critical. It should be understood that the -low-quality modes may not meet the JPEG standard's accuracy retquirements; +low-quality modes may not meet the JPEG standard's accuracy requirements; nonetheless, they are useful for viewers. *** Portability issues *** -Portability is an essential retquirement for the library. The key portability +Portability is an essential requirement for the library. The key portability issues that show up at the level of system architecture are: 1. Memory usage. We want the code to be able to run on PC-class machines @@ -209,7 +209,7 @@ fill in the function pointers with references to whichever module we have determined we need to use in this run. Then invocation of the module is done by indirecting through a function pointer; on most machines this is no more expensive than a switch statement, which would be the only other way of -making the retquired run-time choice. The really significant benefit, of +making the required run-time choice. The really significant benefit, of course, is keeping the source code clean and well structured. We can also arrange to have private storage that varies between different @@ -283,7 +283,7 @@ input data => processing step A => buffer => processing step B => output data | | | ------------------ controller ------------------ -The controller knows the dataflow retquirements of steps A and B: how much data +The controller knows the dataflow requirements of steps A and B: how much data they want to accept in one chunk and how much they output in one chunk. Its function is to manage its buffer and call A and B at the proper times. @@ -299,7 +299,7 @@ be had by replacing implementations of a control module. For example: control modules.) * In some processing modes, a given interstep buffer need only be a "strip" buffer large enough to accommodate the desired data chunk sizes. In other - modes, a full-image buffer is needed and several passes are retquired. + modes, a full-image buffer is needed and several passes are required. The control module determines which kind of buffer is used and manipulates virtual array buffers as needed. One or both processing steps may be unaware of the multi-pass behavior. @@ -345,12 +345,12 @@ The objects shown above are: JPEG color space; also changes the data from pixel-interleaved layout to separate component planes. Processes one pixel row at a time. -* Downsampling: performs reduction of chroma components as retquired. +* Downsampling: performs reduction of chroma components as required. Optionally may perform pixel-level smoothing as well. Processes a "row group" at a time, where a row group is defined as Vmax pixel rows of each component before downsampling, and Vk sample rows afterwards (remember Vk differs across components). Some downsampling or smoothing algorithms may - retquire context rows above and below the current row group; the + require context rows above and below the current row group; the preprocessing controller is responsible for supplying these rows via proper buffering. The downsampler is responsible for edge expansion at the right edge (i.e., extending each sample row to a multiple of 8 samples); but the @@ -380,7 +380,7 @@ The objects shown above are: In addition to the above objects, the compression library includes these objects: -* Master control: determines the number of passes retquired, controls overall +* Master control: determines the number of passes required, controls overall and per-pass initialization of the other modules. * Marker writing: generates JPEG markers (except for RSTn, which is emitted @@ -392,7 +392,7 @@ objects: surrounding application may provide its own destination manager. * Memory manager: allocates and releases memory, controls virtual arrays - (with backing store management, where retquired). + (with backing store management, where required). * Error handler: performs formatting and output of error and trace messages; determines handling of nonfatal errors. The surrounding application may @@ -433,10 +433,10 @@ shown are: * Main controller: buffer controller for the subsampled-data buffer, which holds the output of JPEG decompression proper. This controller's primary task is to feed the postprocessing procedure. Some upsampling algorithms - may retquire context rows above and below the current row group; when this + may require context rows above and below the current row group; when this is true, the main controller is responsible for managing its buffer so as to make context rows available. In the current design, the main buffer is - always a strip buffer; a full-image buffer is never retquired. + always a strip buffer; a full-image buffer is never required. * Coefficient controller: buffer controller for the DCT-coefficient data. This controller handles MCU disassembly, including deletion of any dummy @@ -481,7 +481,7 @@ shown are: * Color quantization: reduce the data to colormapped form, using either an externally specified colormap or an internally generated one. This module is not used for full-color output. Works on one pixel row at a time; may - retquire two passes to generate a color map. Note that the output will + require two passes to generate a color map. Note that the output will always be a single component representing colormap indexes. In the current design, the output values are JSAMPLEs, so an 8-bit compilation cannot quantize to more than 256 colors. This is unlikely to be a problem in @@ -499,7 +499,7 @@ quantize in one step). In addition to the above objects, the decompression library includes these objects: -* Master control: determines the number of passes retquired, controls overall +* Master control: determines the number of passes required, controls overall and per-pass initialization of the other modules. This is subdivided into input and output control: jdinput.c controls only input-side processing, while jdmaster.c handles overall initialization and output-side control. @@ -592,7 +592,7 @@ specification that sample values run from -128..127 is accommodated by subtracting 128 just as the sample value is copied into the source array for the DCT step (this will be an array of signed ints). Similarly, during decompression the output of the IDCT step will be immediately shifted back to -0..255. (NB: different values are retquired when 12-bit samples are in use. +0..255. (NB: different values are required when 12-bit samples are in use. The code is written in terms of MAXJSAMPLE and CENTERJSAMPLE, which will be defined as 255 and 128 respectively in an 8-bit implementation, and as 4095 and 2048 in a 12-bit implementation.) @@ -602,7 +602,7 @@ choice costs only a small amount of memory and has several benefits: * Code using the data structure doesn't need to know the allocated width of the rows. This simplifies edge expansion/compression, since we can work in an array that's wider than the logical picture width. -* Indexing doesn't retquire multiplication; this is a performance win on many +* Indexing doesn't require multiplication; this is a performance win on many machines. * Arrays with more than 64K total elements can be supported even on machines where malloc() cannot allocate chunks larger than 64K. @@ -695,7 +695,7 @@ the entropy codec must be able to stop before having produced or consumed all the data that they normally would handle in one call. That part is reasonably straightforward: we make the controller call interfaces include "progress counters" which indicate the number of data chunks successfully processed, and -we retquire callers to test the counter rather than just assume all of the data +we require callers to test the counter rather than just assume all of the data was processed. Rather than trying to restart at an arbitrary point, the current Huffman @@ -715,7 +715,7 @@ bytes should be enough. In a successive-approximation AC refinement scan, the progressive Huffman decoder has to be able to undo assignments of newly nonzero coefficients if it -suspends before the MCU is complete, since decoding retquires distinguishing +suspends before the MCU is complete, since decoding requires distinguishing previously-zero and previously-nonzero coefficients. This is a bit tedious but probably won't have much effect on performance. Other variants of Huffman decoding need not worry about this, since they will just store the same values @@ -734,7 +734,7 @@ without causing problems; otherwise a 64K buffer would be needed in the worst case.) The JPEG marker writer currently does *not* cope with suspension. I feel that -this is not necessary; it is much easier simply to retquire the application to +this is not necessary; it is much easier simply to require the application to ensure there is enough buffer space before starting. (An empty 2K buffer is more than sufficient for the header markers; and ensuring there are a dozen or two bytes available before calling jpeg_finish_compress() will suffice for the @@ -770,8 +770,8 @@ peak memory usage would be about the same anyway; and having per-pass storage substantially complicates the virtual memory allocation rules --- see below.) The memory manager deals with three kinds of object: -1. "Small" objects. Typically these retquire no more than 10K-20K total. -2. "Large" objects. These may retquire tens to hundreds of K depending on +1. "Small" objects. Typically these require no more than 10K-20K total. +2. "Large" objects. These may require tens to hundreds of K depending on image size. Semantically they behave the same as small objects, but we distinguish them for two reasons: * On MS-DOS machines, large objects are referenced by FAR pointers, @@ -795,7 +795,7 @@ In the present implementation, virtual arrays are only permitted to have image lifespan. (Permanent lifespan would not be reasonable, and pass lifespan is not very useful since a virtual array's raison d'etre is to store data for multiple passes through the image.) We also expect that only "small" objects -will be given permanent lifespan, though this restriction is not retquired by +will be given permanent lifespan, though this restriction is not required by the memory manager. In a non-virtual-memory machine, some performance benefit can be gained by @@ -837,7 +837,7 @@ of the array contain garbage. (This feature exists primarily because the equivalent logic would otherwise be needed in jdcoefct.c for progressive JPEG mode; we may as well make it available for possible other uses.) -The first write pass on a virtual array is retquired to occur in top-to-bottom +The first write pass on a virtual array is required to occur in top-to-bottom order; read passes, as well as any write passes after the first one, may access the array in any order. This restriction exists partly to simplify the virtual array control logic, and partly because some file systems may not @@ -885,7 +885,7 @@ It may be necessary to ensure that backing store objects are explicitly released upon abnormal program termination. For example, MS-DOS won't free extended memory by itself. To support this, we will expect the main program or surrounding application to arrange to call self_destruct (typically via -jpeg_destroy) upon abnormal termination. This may retquire a SIGINT signal +jpeg_destroy) upon abnormal termination. This may require a SIGINT signal handler or equivalent. We don't want to have the back end module install its own signal handler, because that would pre-empt the surrounding application's ability to control signal handling. diff --git a/src/3rdparty/libjpeg/usage.doc b/src/3rdparty/libjpeg/usage.doc index ccf110718..38352c292 100644 --- a/src/3rdparty/libjpeg/usage.doc +++ b/src/3rdparty/libjpeg/usage.doc @@ -356,7 +356,7 @@ If you are fortunate enough to have very fast floating point hardware, because its theoretical accuracy advantage is too small to be significant in practice. -Two-pass color quantization retquires a good deal of memory; on MS-DOS machines +Two-pass color quantization requires a good deal of memory; on MS-DOS machines it may run out of memory even with -maxmemory 0. In that case you can still decompress, with some loss of image quality, by specifying -onepass for one-pass quantization. @@ -559,4 +559,4 @@ file. These utility programs do not depend on the IJG JPEG library. In particular, the source code for rdjpgcom is intended as an illustration of -the minimum amount of code retquired to parse a JPEG file header correctly. +the minimum amount of code required to parse a JPEG file header correctly. diff --git a/src/3rdparty/libjpeg/wizard.doc b/src/3rdparty/libjpeg/wizard.doc index b46815a5e..54170b227 100644 --- a/src/3rdparty/libjpeg/wizard.doc +++ b/src/3rdparty/libjpeg/wizard.doc @@ -148,7 +148,7 @@ the script represents a progressive or sequential file, by observing whether Ss and Se values other than 0 and 63 appear. (The -progressive switch is not needed to specify this; in fact, it is ignored when -scans appears.) The scan script must meet the JPEG restrictions on progression sequences. -(cjpeg checks that the spec's retquirements are obeyed.) +(cjpeg checks that the spec's requirements are obeyed.) Scan script files are free format, in that arbitrary whitespace can appear between numbers and around punctuation. Also, comments can be included: a diff --git a/src/3rdparty/libmng/LICENSE b/src/3rdparty/libmng/LICENSE index 1dca4a86e..bae3a8205 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 e738c7e43..4d72bb97f 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 ed863b263..ba4282ede 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 3cb3e4fa1..d5cd4541d 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 50cb96a3c..2f779e81a 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 0e1a6733d..151990228 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 d9f4169a4..9725a7233 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 4b0c85c3b..511b36336 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 95c086db6..a18940bbe 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 c86faf615..bdc474577 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 0284f1cb3..f9e7d525a 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 737bc7cf3..f16ef91d9 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 081283fe5..d072e3717 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 28c17f70a..c910786ff 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 28c3a1dfe..e881ce1a6 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 544fb4060..d2e460cd7 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 a834ecd92..b3e421803 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 a4e550135..dba8bf56e 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 4d481374c..6915db85d 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 8192a80be..737921722 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 d4fb2d1a5..778e5d0ad 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 e621f2c92..aa346d300 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 663ed35d6..59b9650b0 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 4b0c85c3b..511b36336 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 37d245652..d46f79f64 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 diff --git a/src/3rdparty/libpng/CHANGES b/src/3rdparty/libpng/CHANGES index 3e055b6c4..65d047b18 100644 --- a/src/3rdparty/libpng/CHANGES +++ b/src/3rdparty/libpng/CHANGES @@ -796,7 +796,7 @@ version 1.0.7beta18 [June 23, 2000] Updated contrib/visupng/cexcept.h to version 1.0.0. Fixed bugs in pngwrite.c and pngwutil.c that prevented writing iCCP chunks. version 1.0.7rc2 [June 28, 2000] - Updated license to include disclaimers retquired by UCITA. + Updated license to include disclaimers required by UCITA. Fixed "DJBPP" typo in pnggccrd.c introduced in beta18. version 1.0.7 [July 1, 2000] Revised the definition of "trans_values" in libpng.3/libpng.txt diff --git a/src/3rdparty/libpng/INSTALL b/src/3rdparty/libpng/INSTALL index 330a07903..9eb0d7d83 100644 --- a/src/3rdparty/libpng/INSTALL +++ b/src/3rdparty/libpng/INSTALL @@ -111,7 +111,7 @@ include assembler code tuned for Intel MMX platform) makefile.vcwin32 => makefile for Microsoft Visual C++ 4.0 and later (does not use assembler code) - makefile.os2 => OS/2 Makefile (gcc and emx, retquires pngos2.def) + makefile.os2 => OS/2 Makefile (gcc and emx, requires pngos2.def) pngos2.def => OS/2 module definition file used by makefile.os2 makefile.watcom => Watcom 10a+ Makefile, 32-bit flat memory model makevms.com => VMS build script diff --git a/src/3rdparty/libpng/LICENSE b/src/3rdparty/libpng/LICENSE index ba77b73c4..28b3b6620 100644 --- a/src/3rdparty/libpng/LICENSE +++ b/src/3rdparty/libpng/LICENSE @@ -82,7 +82,7 @@ to the following restrictions: The Contributing Authors and Group 42, Inc. specifically permit, without fee, and encourage the use of this source code as a component to supporting the PNG file format in commercial products. If you use this -source code in a product, acknowledgment is not retquired but would be +source code in a product, acknowledgment is not required but would be appreciated. diff --git a/src/3rdparty/libpng/README b/src/3rdparty/libpng/README index 9432f684d..b1b81384c 100644 --- a/src/3rdparty/libpng/README +++ b/src/3rdparty/libpng/README @@ -238,7 +238,7 @@ Files in this distribution: platform) makefile.vcwin32 => makefile for Microsoft Visual C++ 4.0 and later (does not use assembler code) - makefile.os2 => OS/2 Makefile (gcc and emx, retquires pngos2.def) + makefile.os2 => OS/2 Makefile (gcc and emx, requires pngos2.def) pngos2.def => OS/2 module definition file used by makefile.os2 makefile.watcom => Watcom 10a+ Makefile, 32-bit flat memory model makevms.com => VMS build script diff --git a/src/3rdparty/libpng/example.c b/src/3rdparty/libpng/example.c index 323130f57..7956cf7ab 100644 --- a/src/3rdparty/libpng/example.c +++ b/src/3rdparty/libpng/example.c @@ -7,7 +7,7 @@ * The file libpng.txt is much more verbose then this. If you have not * read it, do so first. This was designed to be a starting point of an * implementation. This is not officially part of libpng, is hereby placed - * in the public domain, and therefore does not retquire a copyright notice. + * in the public domain, and therefore does not require a copyright notice. * * This file does not currently compile, because it is missing certain * parts, like allocating memory to hold an image. You will have to @@ -209,7 +209,7 @@ void read_png(FILE *fp, unsigned int sig_read) /* file is already open */ /* Set the background color to draw transparent and alpha images over. * It is possible to set the red, green, and blue components directly * for paletted images instead of supplying a palette index. Note that - * even if the PNG file supplies a background, you are not retquired to + * even if the PNG file supplies a background, you are not required to * use it - you should use the (solid) application background if it has one. */ diff --git a/src/3rdparty/libpng/libpng.3 b/src/3rdparty/libpng/libpng.3 index 7997da57b..249fc0959 100644 --- a/src/3rdparty/libpng/libpng.3 +++ b/src/3rdparty/libpng/libpng.3 @@ -1156,7 +1156,7 @@ followed the set of transformations indicated by the transform mask, then png_read_image(), and finally png_read_end(). (The final parameter of this call is not yet used. Someday it might point -to transformation parameters retquired by some future input transform.) +to transformation parameters required by some future input transform.) After you have called png_read_png(), you can retrieve the image data with @@ -1473,11 +1473,11 @@ See png_read_update_info(), below. A tquick 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 retquirement to restrict the use to these +suggested keywords, there is no requirement to restrict the use to these strings. It is strongly suggested that keywords and text be sensible to humans (that's the point), so don't use abbreviations. Non-printing symbols are not allowed. See the PNG specification for more details. -There is also no retquirement to have text after the keyword. +There is also no requirement to have text after the keyword. Keywords should be limited to 79 Latin-1 characters without leading or trailing spaces, but non-consecutive spaces are allowed within the @@ -1713,7 +1713,7 @@ to set the display gamma separately for each system is to check for a SCREEN_GAMMA or DISPLAY_GAMMA environment variable, which will hopefully be correctly set. -Note that display_gamma is the overall gamma correction retquired to produce +Note that display_gamma is the overall gamma correction required to produce pleasing results, which depends on the lighting conditions in the surrounding environment. In a dim or brightly lit room, no compensation other than the physical gamma exponent of the monitor is needed, while in a dark room @@ -1843,7 +1843,7 @@ function user_depth, user_channels); The user's application, not libpng, is responsible for allocating and -freeing any memory retquired for the user structure. +freeing any memory required for the user structure. You can retrieve the pointer via the function png_get_user_transform_ptr(). For example: @@ -2699,7 +2699,7 @@ created in a non-PNG format, a still photo from which the image was scanned, or possibly the subject matter itself. In order to facilitate machine-readable dates, it is recommended that the "Creation Time" tEXt chunk use RFC 1123 format dates (e.g. "22 May 1997 18:07:10 GMT"), -although this isn't a retquirement. Unlike the tIME chunk, the +although this isn't a requirement. Unlike the tIME chunk, the "Creation Time" tEXt chunk is not expected to be automatically changed by the software. To facilitate the use of RFC 1123 dates, a function png_convert_to_rfc1123(png_timep) is provided to convert from PNG @@ -2750,7 +2750,7 @@ followed the set of transformations indicated by the transform mask, then png_write_image(), and finally png_write_end(). (The final parameter of this call is not yet used. Someday it might point -to transformation parameters retquired by some future output transform.) +to transformation parameters required by some future output transform.) .SS The low-level write interface @@ -2838,7 +2838,7 @@ file so that decoders can recover the original data if desired. If the data is stored in the row buffer in a bit depth other than one supported by PNG (e.g. 3 bit data in the range 0-7 for a 4-bit PNG), this will scale the values to appear to be the correct bit depth as -is retquired by PNG. +is required by PNG. png_set_shift(png_ptr, &sig_bit); @@ -3935,7 +3935,7 @@ to the following restrictions: The Contributing Authors and Group 42, Inc. specifically permit, without fee, and encourage the use of this source code as a component to supporting the PNG file format in commercial products. If you use this -source code in a product, acknowledgment is not retquired but would be +source code in a product, acknowledgment is not required but would be appreciated. diff --git a/src/3rdparty/libpng/libpng.txt b/src/3rdparty/libpng/libpng.txt index 3eec69635..c0892e508 100644 --- a/src/3rdparty/libpng/libpng.txt +++ b/src/3rdparty/libpng/libpng.txt @@ -365,7 +365,7 @@ followed the set of transformations indicated by the transform mask, then png_read_image(), and finally png_read_end(). (The final parameter of this call is not yet used. Someday it might point -to transformation parameters retquired by some future input transform.) +to transformation parameters required by some future input transform.) After you have called png_read_png(), you can retrieve the image data with @@ -682,11 +682,11 @@ See png_read_update_info(), below. A tquick 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 retquirement to restrict the use to these +suggested keywords, there is no requirement to restrict the use to these strings. It is strongly suggested that keywords and text be sensible to humans (that's the point), so don't use abbreviations. Non-printing symbols are not allowed. See the PNG specification for more details. -There is also no retquirement to have text after the keyword. +There is also no requirement to have text after the keyword. Keywords should be limited to 79 Latin-1 characters without leading or trailing spaces, but non-consecutive spaces are allowed within the @@ -922,7 +922,7 @@ to set the display gamma separately for each system is to check for a SCREEN_GAMMA or DISPLAY_GAMMA environment variable, which will hopefully be correctly set. -Note that display_gamma is the overall gamma correction retquired to produce +Note that display_gamma is the overall gamma correction required to produce pleasing results, which depends on the lighting conditions in the surrounding environment. In a dim or brightly lit room, no compensation other than the physical gamma exponent of the monitor is needed, while in a dark room @@ -1052,7 +1052,7 @@ function user_depth, user_channels); The user's application, not libpng, is responsible for allocating and -freeing any memory retquired for the user structure. +freeing any memory required for the user structure. You can retrieve the pointer via the function png_get_user_transform_ptr(). For example: @@ -1908,7 +1908,7 @@ created in a non-PNG format, a still photo from which the image was scanned, or possibly the subject matter itself. In order to facilitate machine-readable dates, it is recommended that the "Creation Time" tEXt chunk use RFC 1123 format dates (e.g. "22 May 1997 18:07:10 GMT"), -although this isn't a retquirement. Unlike the tIME chunk, the +although this isn't a requirement. Unlike the tIME chunk, the "Creation Time" tEXt chunk is not expected to be automatically changed by the software. To facilitate the use of RFC 1123 dates, a function png_convert_to_rfc1123(png_timep) is provided to convert from PNG @@ -1959,7 +1959,7 @@ followed the set of transformations indicated by the transform mask, then png_write_image(), and finally png_write_end(). (The final parameter of this call is not yet used. Someday it might point -to transformation parameters retquired by some future output transform.) +to transformation parameters required by some future output transform.) The low-level write interface @@ -2047,7 +2047,7 @@ file so that decoders can recover the original data if desired. If the data is stored in the row buffer in a bit depth other than one supported by PNG (e.g. 3 bit data in the range 0-7 for a 4-bit PNG), this will scale the values to appear to be the correct bit depth as -is retquired by PNG. +is required by PNG. png_set_shift(png_ptr, &sig_bit); diff --git a/src/3rdparty/libpng/png.h b/src/3rdparty/libpng/png.h index b48a86094..98390e263 100644 --- a/src/3rdparty/libpng/png.h +++ b/src/3rdparty/libpng/png.h @@ -201,7 +201,7 @@ * The Contributing Authors and Group 42, Inc. specifically permit, without * fee, and encourage the use of this source code as a component to * supporting the PNG file format in commercial products. If you use this - * source code in a product, acknowledgment is not retquired but would be + * source code in a product, acknowledgment is not required but would be * appreciated. */ @@ -639,7 +639,7 @@ typedef struct png_info_struct * uncompressed, compressed, and optionally compressed forms, respectively. * The data in "text" is an array of pointers to uncompressed, * null-terminated C strings. Each chunk has a keyword that describes the - * textual data contained in that chunk. Keywords are not retquired to be + * textual data contained in that chunk. Keywords are not required to be * unique, and the text string may be empty. Any number of text chunks may * be in an image. */ @@ -714,7 +714,7 @@ defined(PNG_READ_BACKGROUND_SUPPORTED) #if defined(PNG_hIST_SUPPORTED) /* The hIST chunk contains the relative frequency or importance of the * various palette entries, so that a viewer can intelligently select a - * reduced-color palette, if retquired. Data is an array of "num_palette" + * reduced-color palette, if required. Data is an array of "num_palette" * values in the range [0,65535]. Data valid if (valid & PNG_INFO_hIST) * is non-zero. */ @@ -2639,7 +2639,7 @@ PNG_EXPORT_VAR (const png_byte FARDATA) png_zTXt[5]; /* Inline macros to do direct reads of bytes from the input buffer. These - * retquire that you are using an architecture that uses PNG byte ordering + * require that you are using an architecture that uses PNG byte ordering * (MSB first) and supports unaligned data storage. I think that PowerPC * in big-endian mode and 680x0 are the only ones that will support this. * The x86 line of processors definitely do not. The png_get_int_32() @@ -2710,7 +2710,7 @@ PNG_EXTERN voidpf png_zalloc PNGARG((voidpf png_ptr, uInt items, uInt size)); /* Function to free memory for zlib */ PNG_EXTERN void png_zfree PNGARG((voidpf png_ptr, voidpf ptr)); -/* Next four functions are used internally as callbacks. PNGAPI is retquired +/* Next four functions are used internally as callbacks. PNGAPI is required * but not PNG_EXPORT. PNGAPI added at libpng version 1.2.3. */ PNG_EXTERN void PNGAPI png_default_read_data PNGARG((png_structp png_ptr, diff --git a/src/3rdparty/libpng/pngconf.h b/src/3rdparty/libpng/pngconf.h index d21410a73..bd5d1c430 100644 --- a/src/3rdparty/libpng/pngconf.h +++ b/src/3rdparty/libpng/pngconf.h @@ -423,7 +423,7 @@ /* The following support, added after version 1.0.0, can be turned off here en * masse by defining PNG_LEGACY_SUPPORTED in case you need binary compatibility - * with old applications that retquire the length of png_struct and png_info + * with old applications that require the length of png_struct and png_info * to remain unchanged. */ @@ -530,7 +530,7 @@ #endif /* about interlacing capability! You'll */ /* still have interlacing unless you change the following line: */ -#define PNG_READ_INTERLACING_SUPPORTED /* retquired for PNG-compliant decoders */ +#define PNG_READ_INTERLACING_SUPPORTED /* required for PNG-compliant decoders */ #ifndef PNG_NO_READ_COMPOSITE_NODIV # ifndef PNG_NO_READ_COMPOSITED_NODIV /* libpng-1.0.x misspelling */ @@ -593,7 +593,7 @@ # endif #endif -#define PNG_WRITE_INTERLACING_SUPPORTED /* not retquired for PNG-compliant +#define PNG_WRITE_INTERLACING_SUPPORTED /* not required for PNG-compliant encoders, but can cause trouble if left undefined */ @@ -1161,7 +1161,7 @@ typedef z_stream FAR * png_zstreamp; /* Do not use global arrays (helps with building DLL's) * They are no longer used in libpng itself, since version 1.0.5c, - * but might be retquired for some pre-1.0.5c applications. + * but might be required for some pre-1.0.5c applications. */ #if !defined(PNG_USE_LOCAL_ARRAYS) && !defined(PNG_USE_GLOBAL_ARRAYS) # if defined(PNG_NO_GLOBAL_ARRAYS) || (defined(__GNUC__) && defined(PNG_DLL)) diff --git a/src/3rdparty/libpng/pnggccrd.c b/src/3rdparty/libpng/pnggccrd.c index ad4021422..8d81c3147 100644 --- a/src/3rdparty/libpng/pnggccrd.c +++ b/src/3rdparty/libpng/pnggccrd.c @@ -22,7 +22,7 @@ * and then cleaned up by hand. See http://hermes.terminal.at/intel2gas/ . * * NOTE: A sufficiently recent version of GNU as (or as.exe under DOS/Windows) - * is retquired to assemble the newer MMX instructions such as movq. + * is required to assemble the newer MMX instructions such as movq. * For djgpp, see * * ftp://ftp.simtel.net/pub/simtelnet/gnu/djgpp/v2gnu/bnu281b.zip @@ -81,7 +81,7 @@ * - Brennan's Guide notwithstanding, gcc under Linux does *not* * want globals prefixed by underscores when referencing them-- * i.e., if the variable is const4, then refer to it as const4, - * not _const4. This seems to be a djgpp-specific retquirement. + * not _const4. This seems to be a djgpp-specific requirement. * Also, such variables apparently *must* be declared outside * of functions; neither static nor automatic variables work if * defined within the scope of a single function, but both diff --git a/src/3rdparty/libpng/pngrutil.c b/src/3rdparty/libpng/pngrutil.c index 0d500900e..798abd2fc 100644 --- a/src/3rdparty/libpng/pngrutil.c +++ b/src/3rdparty/libpng/pngrutil.c @@ -1170,7 +1170,7 @@ png_handle_sPLT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) png_ptr, new_palette.nentries * sizeof(png_sPLT_entry)); if (new_palette.entries == NULL) { - png_warning(png_ptr, "sPLT chunk retquires too much memory"); + png_warning(png_ptr, "sPLT chunk requires too much memory"); return; } @@ -3091,7 +3091,7 @@ defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) 1 + ((max_pixel_depth + 7) >> 3); #ifdef PNG_MAX_MALLOC_64K if (row_bytes > (png_uint_32)65536L) - png_error(png_ptr, "This image retquires a row greater than 64KB"); + png_error(png_ptr, "This image requires a row greater than 64KB"); #endif png_ptr->big_row_buf = (png_bytep)png_malloc(png_ptr, row_bytes+64); png_ptr->row_buf = png_ptr->big_row_buf+32; @@ -3101,7 +3101,7 @@ defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) #ifdef PNG_MAX_MALLOC_64K if ((png_uint_32)png_ptr->rowbytes + 1 > (png_uint_32)65536L) - png_error(png_ptr, "This image retquires a row greater than 64KB"); + png_error(png_ptr, "This image requires a row greater than 64KB"); #endif png_ptr->prev_row = (png_bytep)png_malloc(png_ptr, (png_uint_32)( png_ptr->rowbytes + 1)); diff --git a/src/3rdparty/libpng/pngwrite.c b/src/3rdparty/libpng/pngwrite.c index 91fc56978..1e98090ab 100644 --- a/src/3rdparty/libpng/pngwrite.c +++ b/src/3rdparty/libpng/pngwrite.c @@ -133,7 +133,7 @@ png_write_info(png_structp png_ptr, png_infop info_ptr) png_write_PLTE(png_ptr, info_ptr->palette, (png_uint_32)info_ptr->num_palette); else if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) - png_error(png_ptr, "Valid palette retquired for paletted images\n"); + png_error(png_ptr, "Valid palette required for paletted images\n"); #if defined(PNG_WRITE_tRNS_SUPPORTED) if (info_ptr->valid & PNG_INFO_tRNS) diff --git a/src/3rdparty/libpng/pngwutil.c b/src/3rdparty/libpng/pngwutil.c index 0453632f8..d640179a7 100644 --- a/src/3rdparty/libpng/pngwutil.c +++ b/src/3rdparty/libpng/pngwutil.c @@ -1133,7 +1133,7 @@ png_write_hIST(png_structp png_ptr, png_uint_16p hist, int num_hist) defined(PNG_WRITE_iCCP_SUPPORTED) || defined(PNG_WRITE_sPLT_SUPPORTED) /* Check that the tEXt or zTXt keyword is valid per PNG 1.0 specification, * and if invalid, correct the keyword rather than discarding the entire - * chunk. The PNG 1.0 specification retquires keywords 1-79 characters in + * chunk. The PNG 1.0 specification requires keywords 1-79 characters in * length, forbids leading or trailing whitespace, multiple internal spaces, * and the non-break space (0x80) from ISO 8859-1. Returns keyword length. * @@ -1280,7 +1280,7 @@ png_write_tEXt(png_structp png_ptr, png_charp key, png_charp text, /* make sure we include the 0 after the key */ png_write_chunk_start(png_ptr, (png_bytep)png_tEXt, (png_uint_32)key_len+text_len+1); /* - * We leave it to the application to meet PNG-1.0 retquirements on the + * We leave it to the application to meet PNG-1.0 requirements on the * contents of the text. PNG-1.0 through PNG-1.2 discourage the use of * any non-Latin-1 characters except for NEWLINE. ISO PNG will forbid them. * The NUL character is forbidden by PNG-1.0 through PNG-1.2 and ISO PNG. @@ -1402,7 +1402,7 @@ png_write_iTXt(png_structp png_ptr, int compression, png_charp key, + text_len)); /* - * We leave it to the application to meet PNG-1.0 retquirements on the + * We leave it to the application to meet PNG-1.0 requirements on the * contents of the text. PNG-1.0 through PNG-1.2 discourage the use of * any non-Latin-1 characters except for NEWLINE. ISO PNG will forbid them. * The NUL character is forbidden by PNG-1.0 through PNG-1.2 and ISO PNG. diff --git a/src/3rdparty/libpng/projects/borland/libpng.readme.txt b/src/3rdparty/libpng/projects/borland/libpng.readme.txt index 208fd2398..efe7cbdc6 100644 --- a/src/3rdparty/libpng/projects/borland/libpng.readme.txt +++ b/src/3rdparty/libpng/projects/borland/libpng.readme.txt @@ -11,7 +11,7 @@ Z_PREFIX 3) add libpng.lib or libpngstat.lib to the project. -If you are using libpng.dll, libpng.dll and zlib.dll will be retquired for the code to run. +If you are using libpng.dll, libpng.dll and zlib.dll will be required for the code to run. Alternatively, the libpng.dll can be built using zlibstat.lib to produce one dll containing both the zlib and png code. diff --git a/src/3rdparty/libpng/scripts/makefile.bd32 b/src/3rdparty/libpng/scripts/makefile.bd32 index 784730215..92a57abae 100644 --- a/src/3rdparty/libpng/scripts/makefile.bd32 +++ b/src/3rdparty/libpng/scripts/makefile.bd32 @@ -5,7 +5,7 @@ # $(ZLIBDIR) directory. # The object files here are compiled with the "stdcall" calling convention. -# This DLL retquires zlib32bd.lib to be compiled in the same way. +# This DLL requires zlib32bd.lib to be compiled in the same way. # Note that png32bd.dll exports the zlib functions adler32, crc32 and # the deflate... and inflate... functions. It does not export the diff --git a/src/3rdparty/libpng/scripts/makefile.knr b/src/3rdparty/libpng/scripts/makefile.knr index 28b897a22..44ee538a3 100644 --- a/src/3rdparty/libpng/scripts/makefile.knr +++ b/src/3rdparty/libpng/scripts/makefile.knr @@ -3,7 +3,7 @@ # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # For conditions of distribution and use, see copyright notice in png.h -# This makefile retquires the file ansi2knr.c, which you can get +# This makefile requires the file ansi2knr.c, which you can get # from the Ghostscript ftp site at ftp://ftp.cs.wisc.edu/ghost/ # If you have libjpeg, you probably already have ansi2knr.c in the jpeg # source distribution. diff --git a/src/3rdparty/opentype/FTL.TXT b/src/3rdparty/opentype/FTL.TXT index 904c3270e..459bda326 100644 --- a/src/3rdparty/opentype/FTL.TXT +++ b/src/3rdparty/opentype/FTL.TXT @@ -128,12 +128,12 @@ Legal Terms the name of the other for commercial, advertising, or promotional purposes without specific prior written permission. - We suggest, but do not retquire, that you use one or more of the + We suggest, but do not require, that you use one or more of the following phrases to refer to this software in your documentation or advertising materials: `FreeType Project', `FreeType Engine', `FreeType library', or `FreeType Distribution'. - As you have not signed this license, you are not retquired to + As you have not signed this license, you are not required to accept it. However, as the FreeType Project is copyrighted material, only this license, or another one contracted with the authors, grants you the right to use, distribute, and modify it. diff --git a/src/3rdparty/opentype/ftxopen.h b/src/3rdparty/opentype/ftxopen.h index 9aa176173..64d2820da 100644 --- a/src/3rdparty/opentype/ftxopen.h +++ b/src/3rdparty/opentype/ftxopen.h @@ -47,7 +47,7 @@ extern "C" { struct TTO_LangSys_ { FT_UShort LookupOrderOffset; /* always 0 for TT Open 1.0 */ - FT_UShort ReqFeatureIndex; /* retquired FeatureIndex */ + FT_UShort ReqFeatureIndex; /* required FeatureIndex */ FT_UShort FeatureCount; /* number of Feature indices */ FT_UShort* FeatureIndex; /* array of Feature indices */ }; diff --git a/src/3rdparty/sqlite/attach.c b/src/3rdparty/sqlite/attach.c index 755105179..b333496b0 100644 --- a/src/3rdparty/sqlite/attach.c +++ b/src/3rdparty/sqlite/attach.c @@ -176,7 +176,7 @@ void sqliteDetach(Parse *pParse, Token *pDbname){ ** Initialize a DbFixer structure. This routine must be called prior ** to passing the structure to one of the sqliteFixAAAA() routines below. ** -** The return value indicates whether or not fixation is retquired. TRUE +** The return value indicates whether or not fixation is required. TRUE ** means we do need to fix the database references, FALSE means we do not. */ int sqliteFixInit( diff --git a/src/3rdparty/sqlite/btree.c b/src/3rdparty/sqlite/btree.c index 84a398f17..c5f077ab3 100644 --- a/src/3rdparty/sqlite/btree.c +++ b/src/3rdparty/sqlite/btree.c @@ -31,7 +31,7 @@ ** on Ptr(N+1) and its subpages have values greater than Key(N). And ** so forth. ** -** Finding a particular key retquires reading O(log(M)) pages from the +** Finding a particular key requires reading O(log(M)) pages from the ** disk where M is the number of entries in the tree. ** ** In this implementation, a single file can hold one or more separate @@ -100,7 +100,7 @@ typedef struct FreelistInfo FreelistInfo; ** All structures on a database page are aligned to 4-byte boundries. ** This routine rounds up a number of bytes to the next multiple of 4. ** -** This might need to change for computer architectures that retquire +** This might need to change for computer architectures that require ** and 8-byte alignment boundry for structures. */ #define ROUNDUP(X) ((X+3) & ~3) diff --git a/src/3rdparty/sqlite/btree_rb.c b/src/3rdparty/sqlite/btree_rb.c index e6c5a1a6e..ea4b3dda7 100644 --- a/src/3rdparty/sqlite/btree_rb.c +++ b/src/3rdparty/sqlite/btree_rb.c @@ -807,7 +807,7 @@ static int memRbtreeInsert( pCur->pTree->pHead = pNode; } - /* Point the cursor at the node just inserted, as per SQLite retquirements */ + /* Point the cursor at the node just inserted, as per SQLite requirements */ pCur->pNode = pNode; /* A new node has just been inserted, so run the balancing code */ @@ -1235,7 +1235,7 @@ static int memRbtreeUpdateMeta(Rbtree* tree, int* aMeta) } /* - * Check that each table in the Rbtree meets the retquirements for a red-black + * Check that each table in the Rbtree meets the requirements for a red-black * binary tree. If an error is found, return an explanation of the problem in * memory obtained from sqliteMalloc(). Parameters aRoot and nRoot are ignored. */ diff --git a/src/3rdparty/sqlite/date.c b/src/3rdparty/sqlite/date.c index 353075186..03b66add9 100644 --- a/src/3rdparty/sqlite/date.c +++ b/src/3rdparty/sqlite/date.c @@ -28,7 +28,7 @@ ** 1970-01-01 00:00:00 is JD 2440587.5 ** 2000-01-01 00:00:00 is JD 2451544.5 ** -** This implemention retquires years to be expressed as a 4-digit number +** This implemention requires years to be expressed as a 4-digit number ** which means that only dates between 0000-01-01 and 9999-12-31 can ** be represented, even though julian day numbers allow a much wider ** range of dates. diff --git a/src/3rdparty/sqlite/delete.c b/src/3rdparty/sqlite/delete.c index 15131f562..381e3de31 100644 --- a/src/3rdparty/sqlite/delete.c +++ b/src/3rdparty/sqlite/delete.c @@ -318,7 +318,7 @@ delete_from_cleanup: ** single table to be deleted. ** ** The VDBE must be in a particular state when this routine is called. -** These are the retquirements: +** These are the requirements: ** ** 1. A read/write cursor pointing to pTab, the table containing the row ** to be deleted, must be opened as cursor number "base". @@ -353,7 +353,7 @@ void sqliteGenerateRowDelete( ** index entries associated with a single row of a single table. ** ** The VDBE must be in a particular state when this routine is called. -** These are the retquirements: +** These are the requirements: ** ** 1. A read/write cursor pointing to pTab, the table containing the row ** to be deleted, must be opened as cursor number "iCur". diff --git a/src/3rdparty/sqlite/func.c b/src/3rdparty/sqlite/func.c index 8f71e6ce4..f580a7d45 100644 --- a/src/3rdparty/sqlite/func.c +++ b/src/3rdparty/sqlite/func.c @@ -446,7 +446,7 @@ struct StdDevCtx { int cnt; /* Number of terms counted */ }; -#if 0 /* Omit because math library is retquired */ +#if 0 /* Omit because math library is required */ /* ** Routines used to compute the standard deviation as an aggregate. */ diff --git a/src/3rdparty/sqlite/os.c b/src/3rdparty/sqlite/os.c index d090092de..afbf7e06c 100644 --- a/src/3rdparty/sqlite/os.c +++ b/src/3rdparty/sqlite/os.c @@ -1248,7 +1248,7 @@ int isNT(void){ ** A lock is obtained on the first byte of the lock range before actquiring ** 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() retquire that if there is already a write lock, that +** sqliteOsReadLock() require that if there is already a write lock, that ** lock is converted into a read lock atomically. The lock on the first ** byte allows us to drop the old write lock and get the read lock without ** another process jumping into the middle and messing us up. The same diff --git a/src/3rdparty/sqlite/pager.c b/src/3rdparty/sqlite/pager.c index 3b591bc05..32dcf19b2 100644 --- a/src/3rdparty/sqlite/pager.c +++ b/src/3rdparty/sqlite/pager.c @@ -1402,11 +1402,11 @@ int sqlitepager_get(Pager *pPager, Pgno pgno, void **ppPage){ pPager->nPage++; }else{ /* Find a page to recycle. Try to locate a page that does not - ** retquire us to do an fsync() on the journal. + ** require us to do an fsync() on the journal. */ pPg = pPager->pFirstSynced; - /* If we could not find a page that does not retquire an fsync() + /* If we could not find a page that does not require an fsync() ** on the journal file then fsync the journal file. This is a ** very slow operation, so we work hard to avoid it. But sometimes ** it can't be helped. diff --git a/src/3rdparty/sqlite/parse.c b/src/3rdparty/sqlite/parse.c index dcef55fe4..2fd6ae395 100644 --- a/src/3rdparty/sqlite/parse.c +++ b/src/3rdparty/sqlite/parse.c @@ -815,7 +815,7 @@ void sqliteParserTrace(FILE *TraceFILE, char *zTracePrompt){ #ifndef NDEBUG /* For tracing shifts, the names of all terminals and nonterminals -** are retquired. The following table supplies these names */ +** are required. The following table supplies these names */ static const char *yyTokenName[] = { "$", "END_OF_FILE", "ILLEGAL", "SPACE", "UNCLOSED_STRING", "COMMENT", "FUNCTION", "COLUMN", @@ -876,7 +876,7 @@ static const char *yyTokenName[] = { #endif /* NDEBUG */ #ifndef NDEBUG -/* For tracing reduce actions, the names of all rules are retquired. +/* For tracing reduce actions, the names of all rules are required. */ static const char *yyRuleName[] = { /* 0 */ "input ::= cmdlist", diff --git a/src/3rdparty/sqlite/select.c b/src/3rdparty/sqlite/select.c index 5052bd33d..f47281748 100644 --- a/src/3rdparty/sqlite/select.c +++ b/src/3rdparty/sqlite/select.c @@ -145,7 +145,7 @@ static int columnIndex(Table *pTab, const char *zCol){ } /* -** Add a term to the WHERE expression in *ppExpr that retquires the +** Add a term to the WHERE expression in *ppExpr that requires the ** zCol column to be equal in the two tables pTab1 and pTab2. */ static void addWhereTerm( @@ -1422,7 +1422,7 @@ static int multiSelect(Parse *pParse, Select *p, int eDest, int iParm){ int iCont, iBreak, iStart; int nLimit, nOffset; - /* INTERSECT is different from the others since it retquires + /* INTERSECT is different from the others since it requires ** two temporary tables. Hence it has its own case. Begin ** by allocating the tables we will need. */ @@ -1559,7 +1559,7 @@ substExprList(ExprList *pList, int iTable, ExprList *pEList){ ** ** The default way of implementing this query is to execute the ** subquery first and store the results in a temporary table, then -** run the outer query on that temporary table. This retquires two +** run the outer query on that temporary table. This requires two ** passes over the data. Furthermore, because the temporary table ** has no indices, the WHERE clause on the outer query cannot be ** optimized. @@ -2082,7 +2082,7 @@ int sqliteSelect( } if( pHaving ){ if( pGroupBy==0 ){ - sqliteErrorMsg(pParse, "a GROUP BY clause is retquired before HAVING"); + sqliteErrorMsg(pParse, "a GROUP BY clause is required before HAVING"); goto select_end; } if( sqliteExprResolveIds(pParse, pTabList, pEList, pHaving) ){ diff --git a/src/3rdparty/sqlite/sqliteInt.h b/src/3rdparty/sqlite/sqliteInt.h index 8b3698b22..6fa4af400 100644 --- a/src/3rdparty/sqlite/sqliteInt.h +++ b/src/3rdparty/sqlite/sqliteInt.h @@ -1032,7 +1032,7 @@ struct TriggerStep { }; /* - * An instance of struct TriggerStack stores information retquired during code + * An instance of struct TriggerStack stores information required during code * generation of a single trigger program. While the trigger program is being * coded, its associated TriggerStack instance is pointed to by the * "pTriggerStack" member of the Parse structure. diff --git a/src/3rdparty/sqlite/tokenize.c b/src/3rdparty/sqlite/tokenize.c index a95197c99..96dad9f41 100644 --- a/src/3rdparty/sqlite/tokenize.c +++ b/src/3rdparty/sqlite/tokenize.c @@ -508,7 +508,7 @@ abort_parse: /* ** Return TRUE if the given SQL string ends in a semicolon. ** -** Special handling is retquire for CREATE TRIGGER statements. +** Special handling is require for CREATE TRIGGER statements. ** Whenever the CREATE TRIGGER keywords are seen, the statement ** must end with ";END;". ** diff --git a/src/3rdparty/sqlite/vdbe.c b/src/3rdparty/sqlite/vdbe.c index 4f23aa052..3f0965a93 100644 --- a/src/3rdparty/sqlite/vdbe.c +++ b/src/3rdparty/sqlite/vdbe.c @@ -541,7 +541,7 @@ int sqliteVdbeExec( #endif #ifndef SQLITE_OMIT_PROGRESS_CALLBACK - /* Call the progress callback if it is configured and the retquired number + /* Call the progress callback if it is configured and the required number ** of VDBE ops have been executed (either since this invocation of ** sqliteVdbeExec() or since last time the progress callback was called). ** If the progress callback returns non-zero, exit the virtual machine with diff --git a/src/3rdparty/sqlite/vdbeaux.c b/src/3rdparty/sqlite/vdbeaux.c index d736308c1..6254aa881 100644 --- a/src/3rdparty/sqlite/vdbeaux.c +++ b/src/3rdparty/sqlite/vdbeaux.c @@ -605,7 +605,7 @@ void sqliteVdbeMakeReady( /* No instruction ever pushes more than a single element onto the ** stack. And the stack never grows on successive executions of the ** same loop. So the total number of instructions is an upper bound - ** on the maximum stack depth retquired. + ** on the maximum stack depth required. ** ** Allocation all the stack space we will ever need. */ diff --git a/src/3rdparty/sqlite/where.c b/src/3rdparty/sqlite/where.c index 7eb7db7f5..ea713c336 100644 --- a/src/3rdparty/sqlite/where.c +++ b/src/3rdparty/sqlite/where.c @@ -440,7 +440,7 @@ WhereInfo *sqliteWhereBegin( ** iDirectEq[], iDirectLt[], or iDirectGt[] elements for that table ** to the index of the term containing the ROWID. We always prefer ** to use a ROWID which can directly access a table rather than an - ** index which retquires reading an index first to get the rowid then + ** index which requires reading an index first to get the rowid then ** doing a second read of the actual database table. ** ** Actually, if there are more than 32 tables in the join, only the diff --git a/src/3rdparty/zlib/ChangeLog b/src/3rdparty/zlib/ChangeLog index c5eebaab6..d60b6d377 100644 --- a/src/3rdparty/zlib/ChangeLog +++ b/src/3rdparty/zlib/ChangeLog @@ -277,7 +277,7 @@ Changes in 1.2.0 (9 March 2003) - Point out that zlib and gzip formats are different - Note that Z_BUF_ERROR is not fatal - Document string limit for gzprintf() and possible buffer overflow - - Note retquirement on avail_out when flushing + - Note requirement on avail_out when flushing - Note permitted values of flush parameter of inflate() - Add some FAQs (and even answers) to the FAQ - Add contrib/inflate86/ for x86 faster inflate @@ -683,7 +683,7 @@ Changes in 0.92 (3 May 95) Changes in 0.91 (2 May 95) - Default MEM_LEVEL is 8 (not 9 for Unix) as documented in zlib.h -- Document the memory retquirements in zconf.h +- Document the memory requirements in zconf.h - added "make install" - fix sync search logic in inflateSync - deflate(Z_FULL_FLUSH) now works even if output buffer too short diff --git a/src/3rdparty/zlib/FAQ b/src/3rdparty/zlib/FAQ index 0d9f4e051..4f61f1094 100644 --- a/src/3rdparty/zlib/FAQ +++ b/src/3rdparty/zlib/FAQ @@ -175,7 +175,7 @@ The lastest zlib FAQ is at http://www.gzip.org/zlib/zlib_faq.html No. Please read the license in zlib.h. 24. The license says that altered source versions must be "plainly marked". So - what exactly do I need to do to meet that retquirement? + what exactly do I need to do to meet that requirement? You need to change the ZLIB_VERSION and ZLIB_VERNUM #defines in zlib.h. In particular, the final version number needs to be changed to "f", and an diff --git a/src/3rdparty/zlib/Makefile.in b/src/3rdparty/zlib/Makefile.in index f011d9f6b..a29e9bc6a 100644 --- a/src/3rdparty/zlib/Makefile.in +++ b/src/3rdparty/zlib/Makefile.in @@ -4,7 +4,7 @@ # To compile and test, type: # ./configure; make test -# The call of configure is optional if you don't have special retquirements +# The call of configure is optional if you don't have special requirements # If you wish to build zlib as a shared library, use: ./configure -s # To use the asm code, type: diff --git a/src/3rdparty/zlib/README b/src/3rdparty/zlib/README index a6092e359..df95ae13f 100644 --- a/src/3rdparty/zlib/README +++ b/src/3rdparty/zlib/README @@ -106,7 +106,7 @@ Copyright notice: 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be - appreciated but is not retquired. + appreciated but is not required. 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. diff --git a/src/3rdparty/zlib/configure b/src/3rdparty/zlib/configure index 00cafa8d8..6e138594e 100755 --- a/src/3rdparty/zlib/configure +++ b/src/3rdparty/zlib/configure @@ -154,7 +154,7 @@ SHAREDLIBM=${SHAREDLIBM-"libz$shared_ext.$VER1"} if test $shared -eq 1; then echo Checking for shared library support... - # we must test in two steps (cc then ld), retquired at least on SunOS 4.x + # we must test in two steps (cc then ld), required at least on SunOS 4.x if test "`($CC -c $SFLAGS $test.c) 2>&1`" = "" && test "`($LDSHARED -o $test$shared_ext $test.o) 2>&1`" = ""; then CFLAGS="$SFLAGS" diff --git a/src/3rdparty/zlib/deflate.c b/src/3rdparty/zlib/deflate.c index 7e970d43b..c7f75a3ec 100644 --- a/src/3rdparty/zlib/deflate.c +++ b/src/3rdparty/zlib/deflate.c @@ -149,7 +149,7 @@ local const config configuration_table[10] = { /* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */ #endif -/* Note: the deflate() code retquires max_lazy >= MIN_MATCH and max_chain >= 4 +/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4 * For deflate_fast() (levels <= 3) good is ignored and lazy has a different * meaning. */ @@ -1088,7 +1088,7 @@ local void check_match(s, start, match, length) * IN assertion: lookahead < MIN_LOOKAHEAD * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD * At least one byte has been read, or avail_in == 0; reads are - * performed for at least two bytes (retquired for the zip translate_eol + * performed for at least two bytes (required for the zip translate_eol * option -- not supported here). */ local void fill_window(s) diff --git a/src/3rdparty/zlib/gzio.c b/src/3rdparty/zlib/gzio.c index 74fc49545..c5cccf4d3 100644 --- a/src/3rdparty/zlib/gzio.c +++ b/src/3rdparty/zlib/gzio.c @@ -166,7 +166,7 @@ local gzFile gz_open (path, mode, fd) err = inflateInit2(&(s->stream), -MAX_WBITS); /* windowBits is passed < 0 to tell that there is no zlib header. - * Note that in this case inflate *retquires* an extra "dummy" byte + * Note that in this case inflate *requires* an extra "dummy" byte * after the compressed stream in order to complete decompression and * return Z_STREAM_END. Here the gzip CRC32 ensures that 4 bytes are * present after the compressed stream. @@ -679,7 +679,7 @@ int ZEXPORT gzputc(file, c) gzFile file; int c; { - unsigned char cc = (unsigned char) c; /* retquired for big endian systems */ + unsigned char cc = (unsigned char) c; /* required for big endian systems */ return gzwrite(file, &cc, 1) == 1 ? (int)cc : -1; } diff --git a/src/3rdparty/zlib/infback.c b/src/3rdparty/zlib/infback.c index 99895dc66..262f97c73 100644 --- a/src/3rdparty/zlib/infback.c +++ b/src/3rdparty/zlib/infback.c @@ -225,7 +225,7 @@ struct inflate_state FAR *state; in() and out() are called with a descriptor parameter provided in the inflateBack() call. This parameter can be a structure that provides the - information retquired to do the read or write, as well as accumulated + information required to do the read or write, as well as accumulated information on the input and output such as totals and check values. in() should return zero on failure. out() should return non-zero on diff --git a/src/3rdparty/zlib/inffast.c b/src/3rdparty/zlib/inffast.c index 5bf31ac2a..8c02a178d 100644 --- a/src/3rdparty/zlib/inffast.c +++ b/src/3rdparty/zlib/inffast.c @@ -61,7 +61,7 @@ - The maximum bytes that a single length/distance pair can output is 258 bytes, which is the maximum length that can be coded. inflate_fast() - retquires strm->avail_out >= 258 for each loop to avoid checking for + requires strm->avail_out >= 258 for each loop to avoid checking for output space. */ void inflate_fast(strm, start) diff --git a/src/3rdparty/zlib/projects/README.projects b/src/3rdparty/zlib/projects/README.projects index 5b3b07cfa..56efb8e7c 100644 --- a/src/3rdparty/zlib/projects/README.projects +++ b/src/3rdparty/zlib/projects/README.projects @@ -2,7 +2,7 @@ This directory contains project files for building zlib under various Integrated Development Environments (IDE). If you wish to submit a new project to this directory, you should comply -to the following retquirements. Otherwise (e.g. if you wish to integrate +to the following requirements. Otherwise (e.g. if you wish to integrate a custom piece of code that changes the zlib interface or its behavior), please consider submitting the project to the contrib directory. diff --git a/src/3rdparty/zlib/trees.c b/src/3rdparty/zlib/trees.c index e62e4ac11..52c820fa2 100644 --- a/src/3rdparty/zlib/trees.c +++ b/src/3rdparty/zlib/trees.c @@ -642,7 +642,7 @@ local void build_tree(s, desc) } } - /* The pkzip format retquires that at least one distance code exists, + /* The pkzip format requires that at least one distance code exists, * and that at least one bit should be sent even if there is only one * possible code. So to avoid special checks later on we force at least * two codes of non zero frequency. @@ -816,7 +816,7 @@ local int build_bl_tree(s) */ /* Determine the number of bit length codes to send. The pkzip format - * retquires that at least 4 bit length codes be sent. (appnote.txt says + * requires that at least 4 bit length codes be sent. (appnote.txt says * 3 but the actual value used is 4.) */ for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) { @@ -881,7 +881,7 @@ void _tr_stored_block(s, buf, stored_len, eof) /* =========================================================================== * Send one empty static block to give enough lookahead for inflate. * This takes 10 bits, of which 7 may remain in the bit buffer. - * The current inflate code retquires 9 bits of lookahead. If the + * The current inflate code requires 9 bits of lookahead. If the * last two codes for the previous block (real code plus EOB) were coded * on 5 bits or less, inflate may have only 5+3 bits of lookahead to decode * the last real code. In this case we send two empty static blocks instead diff --git a/src/3rdparty/zlib/win32/DLL_FAQ.txt b/src/3rdparty/zlib/win32/DLL_FAQ.txt index 725b32bd0..1746a951c 100644 --- a/src/3rdparty/zlib/win32/DLL_FAQ.txt +++ b/src/3rdparty/zlib/win32/DLL_FAQ.txt @@ -35,7 +35,7 @@ in the zlib distribution, or at the following location: web site, instead of building it yourself, to avoid potential incompatibilities that could be introduced by your compiler and build settings. If you do build the DLL yourself, please - make sure that it complies with all the above retquirements, + make sure that it complies with all the above requirements, and it runs with the precompiled test programs, bundled with the original ZLIB1.DLL distribution. @@ -46,7 +46,7 @@ in the zlib distribution, or at the following location: 2. Why did you change the name of the DLL to ZLIB1.DLL? What happened to the old ZLIB.DLL? - - The old ZLIB.DLL, built from zlib-1.1.4 or earlier, retquired + - The old ZLIB.DLL, built from zlib-1.1.4 or earlier, required compilation settings that were incompatible to those used by a static build. The DLL settings were supposed to be enabled by defining the macro ZLIB_DLL, before including "zlib.h". @@ -176,8 +176,8 @@ in the zlib distribution, or at the following location: (GNAT) and Fortran (GNU G77), have C bindings implemented initially on Unix, and relying on the C calling convention. On the other hand, the pre- .Net versions of Microsoft Visual - Basic retquire STDCALL, while Borland Delphi prefers, although - it does not retquire, FASTCALL. + Basic require STDCALL, while Borland Delphi prefers, although + it does not require, FASTCALL. In fairness to all possible uses of zlib outside the C programming language, we choose the default "C" convention. @@ -213,7 +213,7 @@ in the zlib distribution, or at the following location: 9. If my application uses ZLIB1.DLL, should I link it to MSVCRT.DLL? Why? - - It is not retquired, but it is recommended to link your + - It is not required, but it is recommended to link your application to MSVCRT.DLL, if it uses ZLIB1.DLL. The executables (.EXE, .DLL, etc.) that are involved in the diff --git a/src/3rdparty/zlib/zconf.h b/src/3rdparty/zlib/zconf.h index c29f97091..3c21403fc 100644 --- a/src/3rdparty/zlib/zconf.h +++ b/src/3rdparty/zlib/zconf.h @@ -142,15 +142,15 @@ # define MAX_WBITS 15 /* 32K LZ77 window */ #endif -/* The memory retquirements for deflate are (in bytes): +/* The memory requirements for deflate are (in bytes): (1 << (windowBits+2)) + (1 << (memLevel+9)) that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values) plus a few kilobytes for small objects. For example, if you want to reduce - the default memory retquirements from 256K to 128K, compile with + the default memory requirements from 256K to 128K, compile with make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7" Of course this will generally degrade compression (there's no free lunch). - The memory retquirements for inflate are (in bytes) 1 << windowBits + The memory requirements for inflate are (in bytes) 1 << windowBits that is, 32K for windowBits=15 (default value) plus a few kilobytes for small objects. */ diff --git a/src/3rdparty/zlib/zconf.in.h b/src/3rdparty/zlib/zconf.in.h index c29f97091..3c21403fc 100644 --- a/src/3rdparty/zlib/zconf.in.h +++ b/src/3rdparty/zlib/zconf.in.h @@ -142,15 +142,15 @@ # define MAX_WBITS 15 /* 32K LZ77 window */ #endif -/* The memory retquirements for deflate are (in bytes): +/* The memory requirements for deflate are (in bytes): (1 << (windowBits+2)) + (1 << (memLevel+9)) that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values) plus a few kilobytes for small objects. For example, if you want to reduce - the default memory retquirements from 256K to 128K, compile with + the default memory requirements from 256K to 128K, compile with make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7" Of course this will generally degrade compression (there's no free lunch). - The memory retquirements for inflate are (in bytes) 1 << windowBits + The memory requirements for inflate are (in bytes) 1 << windowBits that is, 32K for windowBits=15 (default value) plus a few kilobytes for small objects. */ diff --git a/src/3rdparty/zlib/zlib.3 b/src/3rdparty/zlib/zlib.3 index 0f9e0ece1..3139e2467 100644 --- a/src/3rdparty/zlib/zlib.3 +++ b/src/3rdparty/zlib/zlib.3 @@ -141,7 +141,7 @@ This software is provided "as-is," without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. -See the distribution directory with respect to retquirements +See the distribution directory with respect to requirements governing redistribution. The deflate format used by .I zlib diff --git a/src/3rdparty/zlib/zlib.h b/src/3rdparty/zlib/zlib.h index 07c50c676..4c01661b0 100644 --- a/src/3rdparty/zlib/zlib.h +++ b/src/3rdparty/zlib/zlib.h @@ -14,7 +14,7 @@ 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be - appreciated but is not retquired. + appreciated but is not required. 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. @@ -132,12 +132,12 @@ typedef z_stream FAR *z_streamp; thread safe. On 16-bit systems, the functions zalloc and zfree must be able to allocate - exactly 65536 bytes, but will not be retquired to allocate more than this + exactly 65536 bytes, but will not be required to allocate more than this if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS, pointers returned by zalloc for objects of exactly 65536 bytes *must* have their offset normalized to zero. The default allocation function provided by this library ensures this (see zutil.c). To reduce memory - retquirements and avoid any allocation of 64K objects, at the expense of + requirements and avoid any allocation of 64K objects, at the expense of compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h). The fields total_in and total_out can be used for statistics or @@ -402,7 +402,7 @@ ZEXTERN int Q_ZEXPORT inflate OF((z_streamp strm, int flush)); uncompressed data. (The size of the uncompressed data may have been saved by the compressor for this purpose.) The next operation on this stream must be inflateEnd to deallocate the decompression state. The use of Z_FINISH - is never retquired, but can be used to inform inflate that a faster approach + is never required, but can be used to inform inflate that a faster approach may be used for the single inflate() call. In this implementation, inflate() always flushes as much output as @@ -1136,7 +1136,7 @@ ZEXTERN uLong Q_ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len)); /* Update a running Adler-32 checksum with the bytes buf[0..len-1] and return the updated checksum. If buf is NULL, this function returns - the retquired initial value for the checksum. + the required initial value for the checksum. An Adler-32 checksum is almost as reliable as a CRC32 but can be computed much faster. Usage example: @@ -1151,7 +1151,7 @@ ZEXTERN uLong Q_ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len)); ZEXTERN uLong Q_ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len)); /* Update a running crc with the bytes buf[0..len-1] and return the updated - crc. If buf is NULL, this function returns the retquired initial value + crc. If buf is NULL, this function returns the required initial value for the crc. Pre- and post-conditioning (one's complement) is performed within this function so it shouldn't be done by the application. Usage example: |