From 567420317211bf247c0e21fc018ccd6e86e3ff3f Mon Sep 17 00:00:00 2001 From: luzpaz Date: Sun, 31 Jul 2022 16:35:26 -0400 Subject: [PATCH] Fix typos (#1271) Fix typos in source comments and doxygen content. Found via `codespell -q 3 -S CHANGES.md,./ASWF/tsc-meetings -L dout,nnumber,offsetp` Update src/lib/OpenEXR/ImfFastHuf.cpp Signed-off-by: luz paz Signed-off-by: Nick Porcino --- src/lib/OpenEXR/ImfArray.h | 4 +-- src/lib/OpenEXR/ImfB44Compressor.cpp | 4 +-- src/lib/OpenEXR/ImfChannelList.h | 2 +- src/lib/OpenEXR/ImfDeepScanLineInputFile.cpp | 14 +++++----- src/lib/OpenEXR/ImfDeepScanLineOutputFile.cpp | 2 +- src/lib/OpenEXR/ImfDeepTiledInputFile.cpp | 2 +- src/lib/OpenEXR/ImfDeepTiledInputFile.h | 4 +-- src/lib/OpenEXR/ImfDeepTiledInputPart.h | 4 +-- src/lib/OpenEXR/ImfDeepTiledOutputFile.cpp | 4 +-- src/lib/OpenEXR/ImfDeepTiledOutputFile.h | 2 +- src/lib/OpenEXR/ImfDeepTiledOutputPart.h | 2 +- src/lib/OpenEXR/ImfDwaCompressor.cpp | 26 ++++++++--------- src/lib/OpenEXR/ImfDwaCompressor.h | 4 +-- src/lib/OpenEXR/ImfDwaCompressorSimd.h | 10 +++---- src/lib/OpenEXR/ImfEnvmap.h | 2 +- src/lib/OpenEXR/ImfFastHuf.cpp | 8 +++--- src/lib/OpenEXR/ImfFastHuf.h | 4 +-- src/lib/OpenEXR/ImfHeader.h | 4 +-- src/lib/OpenEXR/ImfInputFile.cpp | 2 +- src/lib/OpenEXR/ImfKeyCode.h | 2 +- src/lib/OpenEXR/ImfOptimizedPixelReading.h | 2 +- src/lib/OpenEXR/ImfPizCompressor.cpp | 2 +- src/lib/OpenEXR/ImfScanLineInputFile.cpp | 7 ++--- src/lib/OpenEXR/ImfTileOffsets.cpp | 4 +-- src/lib/OpenEXR/ImfTileOffsets.h | 2 +- src/lib/OpenEXR/ImfTiledInputFile.cpp | 28 +++++++++---------- src/lib/OpenEXR/ImfTiledInputFile.h | 2 +- src/lib/OpenEXR/ImfTiledOutputFile.cpp | 28 +++++++++---------- src/lib/OpenEXR/ImfTiledOutputFile.h | 2 +- src/lib/OpenEXR/ImfTiledRgbaFile.h | 4 +-- src/lib/OpenEXR/ImfWav.cpp | 2 +- src/lib/OpenEXR/dwaLookups.cpp | 2 +- src/lib/OpenEXRCore/chunk.c | 8 +++--- src/lib/OpenEXRCore/decoding.c | 2 +- src/lib/OpenEXRCore/encoding.c | 2 +- src/lib/OpenEXRCore/internal_b44.c | 2 +- src/lib/OpenEXRCore/internal_piz.c | 2 +- src/lib/OpenEXRCore/validation.c | 2 +- src/lib/OpenEXRUtil/ImfCheckFile.cpp | 6 ++-- src/lib/OpenEXRUtil/ImfSampleCountChannel.h | 2 +- src/lib/OpenEXRUtil/README | 2 +- 41 files changed, 109 insertions(+), 110 deletions(-) diff --git a/src/lib/OpenEXR/ImfArray.h b/src/lib/OpenEXR/ImfArray.h index 37183a7e85..b840b99bd2 100644 --- a/src/lib/OpenEXR/ImfArray.h +++ b/src/lib/OpenEXR/ImfArray.h @@ -191,7 +191,7 @@ inline Array2D::Array2D (): _sizeX(0), _sizeY (0), _data (0) { - // emtpy + // empty } @@ -200,7 +200,7 @@ inline Array2D::Array2D (long sizeX, long sizeY): _sizeX (sizeX), _sizeY (sizeY), _data (new T[sizeX * sizeY]) { - // emtpy + // empty } diff --git a/src/lib/OpenEXR/ImfB44Compressor.cpp b/src/lib/OpenEXR/ImfB44Compressor.cpp index a013174371..cb92a94078 100644 --- a/src/lib/OpenEXR/ImfB44Compressor.cpp +++ b/src/lib/OpenEXR/ImfB44Compressor.cpp @@ -219,7 +219,7 @@ pack (const unsigned short s[16], // // Compute a set of running differences, r[0] ... r[14]: // Find a shift value such that after rounding off the - // rightmost bits and shifting all differenes are between + // rightmost bits and shifting all differences are between // -32 and +31. Then bias the differences so that they // end up between 0 and 63. // @@ -618,7 +618,7 @@ B44Compressor::compress (const char *inPtr, } // - // For each channel, detemine how many pixels are stored + // For each channel, determine how many pixels are stored // in the input buffer, and where those pixels will be // placed in _tmpBuffer. // diff --git a/src/lib/OpenEXR/ImfChannelList.h b/src/lib/OpenEXR/ImfChannelList.h index 4a056cbd5e..4e60268ed7 100644 --- a/src/lib/OpenEXR/ImfChannelList.h +++ b/src/lib/OpenEXR/ImfChannelList.h @@ -53,7 +53,7 @@ struct IMF_EXPORT_TYPE Channel // human perception of the quantity represented by this channel // is closer to linear or closer to logarithmic. Compression // methods may optimize image quality by adjusting pixel data - // quantization acording to this hint. + // quantization according to this hint. // For example, perception of red, green, blue and luminance is // approximately logarithmic; the difference between 0.1 and 0.2 // is perceived to be roughly the same as the difference between diff --git a/src/lib/OpenEXR/ImfDeepScanLineInputFile.cpp b/src/lib/OpenEXR/ImfDeepScanLineInputFile.cpp index e06eb0cac6..10abd0a30a 100644 --- a/src/lib/OpenEXR/ImfDeepScanLineInputFile.cpp +++ b/src/lib/OpenEXR/ImfDeepScanLineInputFile.cpp @@ -1047,11 +1047,11 @@ newLineBufferTask // // when handling files with dataWindows with a large number of pixels, -// the sampleCount values are not precached and Data::sampleCount is not asigned -// instead, the sampleCount is read every time readPixels() is called +// the sampleCount values are not precached and Data::sampleCount is not +// assigned instead, the sampleCount is read every time readPixels() is called // and sample counts are stored in LineBuffer::_tempCountBuffer instead // (A square image that is 16k by 16k pixels has gBigFileDataWindowSize pixels, -// andthe sampleCount table would take 1GiB of memory to store) +// and the sampleCount table would take 1GiB of memory to store) // const uint64_t gBigFileDataWindowSize = (1<<28); @@ -1239,8 +1239,8 @@ DeepScanLineInputFile::DeepScanLineInputFile throw; } - // - // not multiPart - allocate stream data and intialise as normal + // + // not multiPart - allocate stream data and initialise as normal // try { @@ -1315,7 +1315,7 @@ DeepScanLineInputFile::DeepScanLineInputFile } // - // not multiPart - allocate stream data and intialise as normal + // not multiPart - allocate stream data and initialise as normal // try { @@ -1715,7 +1715,7 @@ DeepScanLineInputFile::readPixels (int scanLine1, int scanLine2) } // - // Exeption handling: + // Exception handling: // // LineBufferTask::execute() may have encountered exceptions, but // those exceptions occurred in another thread, not in the thread diff --git a/src/lib/OpenEXR/ImfDeepScanLineOutputFile.cpp b/src/lib/OpenEXR/ImfDeepScanLineOutputFile.cpp index 19c8c9471e..5c5c5cdc72 100644 --- a/src/lib/OpenEXR/ImfDeepScanLineOutputFile.cpp +++ b/src/lib/OpenEXR/ImfDeepScanLineOutputFile.cpp @@ -1333,7 +1333,7 @@ DeepScanLineOutputFile::writePixels (int numScanLines) } // - // Exeption handling: + // Exception handling: // // LineBufferTask::execute() may have encountered exceptions, but // those exceptions occurred in another thread, not in the thread diff --git a/src/lib/OpenEXR/ImfDeepTiledInputFile.cpp b/src/lib/OpenEXR/ImfDeepTiledInputFile.cpp index 50f6b2e827..03adc84647 100644 --- a/src/lib/OpenEXR/ImfDeepTiledInputFile.cpp +++ b/src/lib/OpenEXR/ImfDeepTiledInputFile.cpp @@ -1351,7 +1351,7 @@ DeepTiledInputFile::readTiles (int dx1, int dx2, int dy1, int dy2, int lx, int l } // - // Exeption handling: + // Exception handling: // // TileBufferTask::execute() may have encountered exceptions, but // those exceptions occurred in another thread, not in the thread diff --git a/src/lib/OpenEXR/ImfDeepTiledInputFile.h b/src/lib/OpenEXR/ImfDeepTiledInputFile.h index b01330f3b3..ca3372c7ac 100644 --- a/src/lib/OpenEXR/ImfDeepTiledInputFile.h +++ b/src/lib/OpenEXR/ImfDeepTiledInputFile.h @@ -313,7 +313,7 @@ class IMF_EXPORT_TYPE DeepTiledInputFile : public GenericInputFile // dy must lie in the interval [0, numYTiles(ly)-1] // // lx must lie in the interval [0, numXLevels()-1] - // ly must lie in the inverval [0, numYLevels()-1] + // ly must lie in the interval [0, numYLevels()-1] // // readTile(dx, dy, level) is a convenience function used // for ONE_LEVEL and MIPMAP_LEVELS files. It calls @@ -370,7 +370,7 @@ class IMF_EXPORT_TYPE DeepTiledInputFile : public GenericInputFile // dy must lie in the interval [0, numYTiles(ly)-1] // // lx must lie in the interval [0, numXLevels()-1] - // ly must lie in the inverval [0, numYLevels()-1] + // ly must lie in the interval [0, numYLevels()-1] // // readPixelSampleCounts(dx1, dx2, dy1, dy2, lx, ly) reads all // the sample counts for tiles within range diff --git a/src/lib/OpenEXR/ImfDeepTiledInputPart.h b/src/lib/OpenEXR/ImfDeepTiledInputPart.h index e5f950a931..a9ef38a078 100644 --- a/src/lib/OpenEXR/ImfDeepTiledInputPart.h +++ b/src/lib/OpenEXR/ImfDeepTiledInputPart.h @@ -269,7 +269,7 @@ class IMF_EXPORT_TYPE DeepTiledInputPart // dy must lie in the interval [0, numYTiles(ly)-1] // // lx must lie in the interval [0, numXLevels()-1] - // ly must lie in the inverval [0, numYLevels()-1] + // ly must lie in the interval [0, numYLevels()-1] // // readTile(dx, dy, level) is a convenience function used // for ONE_LEVEL and MIPMAP_LEVELS files. It calls @@ -327,7 +327,7 @@ class IMF_EXPORT_TYPE DeepTiledInputPart // dy must lie in the interval [0, numYTiles(ly)-1] // // lx must lie in the interval [0, numXLevels()-1] - // ly must lie in the inverval [0, numYLevels()-1] + // ly must lie in the interval [0, numYLevels()-1] // // readPixelSampleCounts(dx1, dx2, dy1, dy2, lx, ly) reads all // the sample counts for tiles within range diff --git a/src/lib/OpenEXR/ImfDeepTiledOutputFile.cpp b/src/lib/OpenEXR/ImfDeepTiledOutputFile.cpp index 2f369d2554..5a4b5c5eeb 100644 --- a/src/lib/OpenEXR/ImfDeepTiledOutputFile.cpp +++ b/src/lib/OpenEXR/ImfDeepTiledOutputFile.cpp @@ -899,7 +899,7 @@ TileBufferTask::execute () int xOffsetForData = slice.xTileCoords ? tileRange.min.x : 0; int yOffsetForData = slice.yTileCoords ? tileRange.min.y : 0; - // (TOOD) treat sample count offsets differently. + // (TODO) treat sample count offsets differently. copyFromDeepFrameBuffer (writePtr, slice.base, _ofd->sampleCountSliceBase, @@ -1590,7 +1590,7 @@ DeepTiledOutputFile::writeTiles (int dx1, int dx2, int dy1, int dy2, } // - // Exeption handling: + // Exception handling: // // TileBufferTask::execute() may have encountered exceptions, but // those exceptions occurred in another thread, not in the thread diff --git a/src/lib/OpenEXR/ImfDeepTiledOutputFile.h b/src/lib/OpenEXR/ImfDeepTiledOutputFile.h index 97a3aa04a1..e1e838d2e5 100644 --- a/src/lib/OpenEXR/ImfDeepTiledOutputFile.h +++ b/src/lib/OpenEXR/ImfDeepTiledOutputFile.h @@ -309,7 +309,7 @@ class IMF_EXPORT_TYPE DeepTiledOutputFile : public GenericOutputFile // dy must lie in the interval [0, numYTiles(ly) - 1] // // lx must lie in the interval [0, numXLevels() - 1] - // ly must lie in the inverval [0, numYLevels() - 1] + // ly must lie in the interval [0, numYLevels() - 1] // // writeTile(dx, dy, level) is a convenience function // used for ONE_LEVEL and MIPMAP_LEVEL files. It calls diff --git a/src/lib/OpenEXR/ImfDeepTiledOutputPart.h b/src/lib/OpenEXR/ImfDeepTiledOutputPart.h index f42c78d832..47f902d6e0 100644 --- a/src/lib/OpenEXR/ImfDeepTiledOutputPart.h +++ b/src/lib/OpenEXR/ImfDeepTiledOutputPart.h @@ -250,7 +250,7 @@ class IMF_EXPORT_TYPE DeepTiledOutputPart // dy must lie in the interval [0, numYTiles(ly) - 1] // // lx must lie in the interval [0, numXLevels() - 1] - // ly must lie in the inverval [0, numYLevels() - 1] + // ly must lie in the interval [0, numYLevels() - 1] // // writeTile(dx, dy, level) is a convenience function // used for ONE_LEVEL and MIPMAP_LEVEL files. It calls diff --git a/src/lib/OpenEXR/ImfDwaCompressor.cpp b/src/lib/OpenEXR/ImfDwaCompressor.cpp index 829138d876..6426fc13f0 100644 --- a/src/lib/OpenEXR/ImfDwaCompressor.cpp +++ b/src/lib/OpenEXR/ImfDwaCompressor.cpp @@ -18,11 +18,11 @@ // into the start of the data block, making a self-contained file. // If initializeDefaultChannelRules() doesn't quite suite your naming // conventions, you can adjust the rules without breaking decoder -// compatability. +// compatibility. // // If we're going to lossy compress R, G, or B channels, it's easier // to toss bits in a more perceptual uniform space. One could argue -// at length as to what constitutes perceptually uniform, expecially +// at length as to what constitutes perceptually uniform, especially // when storing either scene/input/focal plane referred and output referred // data. // @@ -55,10 +55,10 @@ // // For each DCT component, we want to find a quantized value that // is within +- the per-component error. Pick the quantized value -// that has the fewest bits set in its' binary representation. -// Brute-forcing the search would make for extremly inefficient -// compression. Fortunatly, we can precompute a table to assist -// with this search. +// that has the fewest bits set in its' binary representation. +// Brute-forcing the search would make for extremely inefficient +// compression. Fortunately, we can precompute a table to assist +// with this search. // // For each 16-bit float value, there are at most 15 other values with // fewer bits set. We can precompute these values in a compact form, since @@ -149,7 +149,7 @@ OPENEXR_IMF_INTERNAL_NAMESPACE_SOURCE_ENTER namespace { // - // Function pointer to dispatch to an approprate + // Function pointer to dispatch to an appropriate // convertFloatToHalf64_* impl, based on runtime cpu checking. // Should be initialized in DwaCompressor::initializeFuncs() // @@ -1686,8 +1686,8 @@ DwaCompressor::LossyDctEncoderBase::quantize (half src, float errorTolerance) // Try to do a simple RLE scheme to reduce run's of 0's. This // differs from the jpeg EOB case, since EOB just indicates that // the rest of the block is zero. In our case, we have lots of -// NaN symbols, which shouldn't be allowed to occur in DCT -// coefficents - so we'll use them for encoding runs. +// NaN symbols, which shouldn't be allowed to occur in DCT +// coefficients - so we'll use them for encoding runs. // // If the high byte is 0xff, then we have a run of 0's, of length // given by the low byte. For example, 0xff03 would be a run @@ -3011,8 +3011,8 @@ DwaCompressor::initializeBuffers (size_t &outBufferSize) static_cast (compressBound (static_cast (unknownBufferSize))); // - // Allocate a zip/deflate compressor big enought to hold the DC data - // and include it's compressed results in the size requirements + // Allocate a zip/deflate compressor big enough to hold the DC data + // and include its compressed results in the size requirements // for our output buffer // @@ -3258,8 +3258,8 @@ DwaCompressor::relevantChannelRules (std::vector &rules) const // // Take our initial list of channels, and cache the contents. // -// Determine approprate compression schemes for each channel, -// and figure out which sets should potentially be CSC'ed +// Determine appropriate compression schemes for each channel, +// and figure out which sets should potentially be CSC'ed // prior to lossy compression. // diff --git a/src/lib/OpenEXR/ImfDwaCompressor.h b/src/lib/OpenEXR/ImfDwaCompressor.h index 11aba86dc6..6ed0188496 100644 --- a/src/lib/OpenEXR/ImfDwaCompressor.h +++ b/src/lib/OpenEXR/ImfDwaCompressor.h @@ -168,8 +168,8 @@ class DwaCompressor: public Compressor // Populate our cached version of the channel data with // data from the real channel list. We want to // copy over attributes, determine compression schemes - // releveant for the channel type, and find sets of - // channels to be compressed from Y'CbCr data instead + // relevant for the channel type, and find sets of + // channels to be compressed from Y'CbCr data instead // of R'G'B'. // diff --git a/src/lib/OpenEXR/ImfDwaCompressorSimd.h b/src/lib/OpenEXR/ImfDwaCompressorSimd.h index 906608a0e3..87aecbd84f 100644 --- a/src/lib/OpenEXR/ImfDwaCompressorSimd.h +++ b/src/lib/OpenEXR/ImfDwaCompressorSimd.h @@ -420,7 +420,7 @@ convertFloatToHalf64_f16c (unsigned short *dst, float *src) // // Now, it's quite likely that we'll find ourselves in situations // where we want to build *without* VEX, in order to maintain - // maximum compatability. But to get there with intrinsics, + // maximum compatibility. But to get there with intrinsics, // we'd need to break out code into a separate file. Bleh. // I'll take the asm. // @@ -605,8 +605,8 @@ fromHalfZigZag_scalar (unsigned short *src, float *dst) // the even rows are in descending order. // // If we 'fold' the bottom half up into the top, we can preserve ordered -// runs accross rows, and still keep all the correct values in columns. -// After transposing, we'll need to rotate things back into place. +// runs across rows, and still keep all the correct values in columns. +// After transposing, we'll need to rotate things back into place. // This gives us: // // 0 | 42 41 40 39 38 37 36 @@ -691,7 +691,7 @@ fromHalfZigZag_f16c (unsigned short *src, float *dst) /* Reverse the even rows. We're not using PSHUFB as * that requires loading an extra constant all the time, - * and we're alreadly pretty memory bound. + * and we're already pretty memory bound. */ "vpshuflw $0x1b, %%xmm0, %%xmm0 \n" @@ -1293,7 +1293,7 @@ dctInverse8x8_sse2 (float *data) * they depend. * * This should work for the cases where we have 2-8 full rows. - * the 1-row case is special, and we'll handle it seperately. + * the 1-row case is special, and we'll handle it separately. */ #define IDCT_AVX_BODY \ /* ============================================== diff --git a/src/lib/OpenEXR/ImfEnvmap.h b/src/lib/OpenEXR/ImfEnvmap.h index c2639aba6a..d28e2138dc 100644 --- a/src/lib/OpenEXR/ImfEnvmap.h +++ b/src/lib/OpenEXR/ImfEnvmap.h @@ -27,7 +27,7 @@ // values. // // For each possible EnvmapAttribute value, this header file also -// defines a set of convienience functions to convert between 3D +// defines a set of convenience functions to convert between 3D // directions and 2D pixel locations. // // Most of the convenience functions defined below require a diff --git a/src/lib/OpenEXR/ImfFastHuf.cpp b/src/lib/OpenEXR/ImfFastHuf.cpp index c72e28d1ff..fbb1a1bdb0 100644 --- a/src/lib/OpenEXR/ImfFastHuf.cpp +++ b/src/lib/OpenEXR/ImfFastHuf.cpp @@ -64,7 +64,7 @@ FastHufDecoder::FastHufDecoder // // The 'offset' table is the position (in sorted order) of the first id - // of a given code lenght. Array is indexed by code length, like base. + // of a given code length. Array is indexed by code length, like base. // uint64_t offset[MAX_CODE_LEN + 1]; @@ -515,7 +515,7 @@ FastHufDecoder::refill // // We can have cases where the previous shift of bufferBack is << 64 - // this is an undefined operation but tends to create just zeroes. - // so if we won't have any bits left, zero out bufferBack insetad of computing the shift + // so if we won't have any bits left, zero out bufferBack instead of computing the shift // if (bufferBackNumBits <= numBits) @@ -559,7 +559,7 @@ FastHufDecoder::readBits // small-ish table to accelerate decoding of short codes. // // If possible, try looking up codes into the acceleration table. -// This has a few benifits - there's no search involved; We don't +// This has a few benefits - there's no search involved; We don't // need an additional lookup to map id to symbol; we don't need // a full 64-bits (so less refilling). // @@ -680,7 +680,7 @@ FastHufDecoder::decode bufferNumBits -= codeLen; // - // If we recieved a RLE symbol (_rleSymbol), then we need + // If we received a RLE symbol (_rleSymbol), then we need // to read ahead 8 bits to know how many times to repeat // the previous symbol. Need to ensure we at least have // 8 bits of data in the buffer diff --git a/src/lib/OpenEXR/ImfFastHuf.h b/src/lib/OpenEXR/ImfFastHuf.h index c2bfb26a76..17afd1dea8 100644 --- a/src/lib/OpenEXR/ImfFastHuf.h +++ b/src/lib/OpenEXR/ImfFastHuf.h @@ -22,8 +22,8 @@ OPENEXR_IMF_INTERNAL_NAMESPACE_HEADER_ENTER // // The premise is that instead of working directly with the coded // symbols, we create a new ordering based on the frequency of symbols. -// Less frequent symbols (and thus longer codes) are ordered earler. -// We're calling the values in this ordering 'Ids', as oppsed to +// Less frequent symbols (and thus longer codes) are ordered earlier. +// We're calling the values in this ordering 'Ids', as oppsed to // 'Symbols' - which are the short values we eventually want decoded. // // With this new ordering, a few small tables can be derived ('base' diff --git a/src/lib/OpenEXR/ImfHeader.h b/src/lib/OpenEXR/ImfHeader.h index a0174ecaf4..0741402bcb 100644 --- a/src/lib/OpenEXR/ImfHeader.h +++ b/src/lib/OpenEXR/ImfHeader.h @@ -428,7 +428,7 @@ class IMF_EXPORT_TYPE Header //------------------------------------------------------------- // Sanity check -- examines the header, and throws an exception // if it finds something wrong (empty display window, negative - // pixel aspect ratio, unknown compression sceme etc.) + // pixel aspect ratio, unknown compression scheme etc...) // // set isTiled to true if you are checking a tiled/multi-res // header @@ -440,7 +440,7 @@ class IMF_EXPORT_TYPE Header //---------------------------------------------------------------- - // Maximum image size and maximim tile size: + // Maximum image size and maximum tile size: // // sanityCheck() will throw an exception if the width or height of // the data window exceeds the maximum image width or height, or diff --git a/src/lib/OpenEXR/ImfInputFile.cpp b/src/lib/OpenEXR/ImfInputFile.cpp index c520c14e9f..04a450c637 100644 --- a/src/lib/OpenEXR/ImfInputFile.cpp +++ b/src/lib/OpenEXR/ImfInputFile.cpp @@ -186,7 +186,7 @@ bufferedReadPixels (InputFile::Data* ifd, int scanLine1, int scanLine2) // // bufferedReadPixels reads each row of tiles that intersect the // scan-line range (scanLine1 to scanLine2). The previous row of - // tiles is cached in order to prevent redundent tile reads when + // tiles is cached in order to prevent redundant tile reads when // accessing scanlines sequentially. // diff --git a/src/lib/OpenEXR/ImfKeyCode.h b/src/lib/OpenEXR/ImfKeyCode.h index 4916797afd..45c92385ed 100644 --- a/src/lib/OpenEXR/ImfKeyCode.h +++ b/src/lib/OpenEXR/ImfKeyCode.h @@ -11,7 +11,7 @@ // class KeyCode // // A KeyCode object uniquely identifies a motion picture film frame. -// The following fields specifiy film manufacturer, film type, film +// The following fields specify film manufacturer, film type, film // roll and the frame's position within the roll: // // filmMfcCode film manufacturer code diff --git a/src/lib/OpenEXR/ImfOptimizedPixelReading.h b/src/lib/OpenEXR/ImfOptimizedPixelReading.h index d433dc1186..9fc1c91722 100644 --- a/src/lib/OpenEXR/ImfOptimizedPixelReading.h +++ b/src/lib/OpenEXR/ImfOptimizedPixelReading.h @@ -35,7 +35,7 @@ class OptimizationMode //------------------------------------------------------------------------ -// Test for SSE pointer alignemnt +// Test for SSE pointer alignment //------------------------------------------------------------------------ EXR_FORCEINLINE bool diff --git a/src/lib/OpenEXR/ImfPizCompressor.cpp b/src/lib/OpenEXR/ImfPizCompressor.cpp index 0a1288d857..645840658d 100644 --- a/src/lib/OpenEXR/ImfPizCompressor.cpp +++ b/src/lib/OpenEXR/ImfPizCompressor.cpp @@ -192,7 +192,7 @@ PizCompressor::PizCompressor // // We can support uncompressed data in the machine's native format // if all image channels are of type HALF, and if the Xdr and the - // native represenations of a half have the same size. + // native representations of a half have the same size. // if (onlyHalfChannels && (sizeof (half) == pixelTypeSize (HALF))) diff --git a/src/lib/OpenEXR/ImfScanLineInputFile.cpp b/src/lib/OpenEXR/ImfScanLineInputFile.cpp index 050bf768f3..0af691c57c 100644 --- a/src/lib/OpenEXR/ImfScanLineInputFile.cpp +++ b/src/lib/OpenEXR/ImfScanLineInputFile.cpp @@ -886,7 +886,7 @@ LineBufferTaskIIF::execute() // // Set the readPtr to read at the start of uncompressedData - // but with an offet based on calculated array. + // but with an offset based on calculated array. // _ifd->offsetInLineBuffer contains offsets based on which // line we are currently processing. // Stride will be taken into consideration later. @@ -1311,9 +1311,8 @@ ScanLineInputFile::version () const namespace { - - -// returns the optimization state for the given arrangement of frame bufers + +// returns the optimization state for the given arrangement of frame buffers // this assumes: // both the file and framebuffer are half float data // both the file and framebuffer have xSampling and ySampling=1 diff --git a/src/lib/OpenEXR/ImfTileOffsets.cpp b/src/lib/OpenEXR/ImfTileOffsets.cpp index 52b2fde9f6..0120e3bc44 100644 --- a/src/lib/OpenEXR/ImfTileOffsets.cpp +++ b/src/lib/OpenEXR/ImfTileOffsets.cpp @@ -455,7 +455,7 @@ TileOffsets::operator () (int dx, int dy, int lx, int ly) // // Looks up the value of the tile with tile coordinate (dx, dy) // and level number (lx, ly) in the _offsets array, and returns - // the cooresponding offset. + // the corresponding offset. // switch (_mode) @@ -492,7 +492,7 @@ TileOffsets::operator () (int dx, int dy, int lx, int ly) const // // Looks up the value of the tile with tile coordinate (dx, dy) // and level number (lx, ly) in the _offsets array, and returns - // the cooresponding offset. + // the corresponding offset. // switch (_mode) diff --git a/src/lib/OpenEXR/ImfTileOffsets.h b/src/lib/OpenEXR/ImfTileOffsets.h index 9e5ccfab51..b0ae543e21 100644 --- a/src/lib/OpenEXR/ImfTileOffsets.h +++ b/src/lib/OpenEXR/ImfTileOffsets.h @@ -57,7 +57,7 @@ class IMF_EXPORT_TYPE TileOffsets //----------------------------------------------------------- // populate 'list' with tiles coordinates in the order they appear // in the offset table (assumes full table! - // each array myst be at leat totalTiles long + // each array myst be at least totalTiles long //----------------------------------------------------------- IMF_EXPORT void getTileOrder(int dx_table[], int dy_table[], int lx_table[], int ly_table[]) const; diff --git a/src/lib/OpenEXR/ImfTiledInputFile.cpp b/src/lib/OpenEXR/ImfTiledInputFile.cpp index 49ad69be68..3113319cbf 100644 --- a/src/lib/OpenEXR/ImfTiledInputFile.cpp +++ b/src/lib/OpenEXR/ImfTiledInputFile.cpp @@ -1330,20 +1330,20 @@ TiledInputFile::readTiles (int dx1, int dx2, int dy1, int dy2, int lx, int ly) // } - // - // Exeption handling: - // - // TileBufferTask::execute() may have encountered exceptions, but - // those exceptions occurred in another thread, not in the thread - // that is executing this call to TiledInputFile::readTiles(). - // TileBufferTask::execute() has caught all exceptions and stored - // the exceptions' what() strings in the tile buffers. - // Now we check if any tile buffer contains a stored exception; if - // this is the case then we re-throw the exception in this thread. - // (It is possible that multiple tile buffers contain stored - // exceptions. We re-throw the first exception we find and - // ignore all others.) - // + // + // Exception handling: + // + // TileBufferTask::execute() may have encountered exceptions, but + // those exceptions occurred in another thread, not in the thread + // that is executing this call to TiledInputFile::readTiles(). + // TileBufferTask::execute() has caught all exceptions and stored + // the exceptions' what() strings in the tile buffers. + // Now we check if any tile buffer contains a stored exception; if + // this is the case then we re-throw the exception in this thread. + // (It is possible that multiple tile buffers contain stored + // exceptions. We re-throw the first exception we find and + // ignore all others.) + // const string *exception = 0; diff --git a/src/lib/OpenEXR/ImfTiledInputFile.h b/src/lib/OpenEXR/ImfTiledInputFile.h index 146a179691..d930d5de6f 100644 --- a/src/lib/OpenEXR/ImfTiledInputFile.h +++ b/src/lib/OpenEXR/ImfTiledInputFile.h @@ -315,7 +315,7 @@ class IMF_EXPORT_TYPE TiledInputFile : public GenericInputFile // dy must lie in the interval [0, numYTiles(ly)-1] // // lx must lie in the interval [0, numXLevels()-1] - // ly must lie in the inverval [0, numYLevels()-1] + // ly must lie in the interval [0, numYLevels()-1] // // readTile(dx, dy, level) is a convenience function used // for ONE_LEVEL and MIPMAP_LEVELS files. It calls diff --git a/src/lib/OpenEXR/ImfTiledOutputFile.cpp b/src/lib/OpenEXR/ImfTiledOutputFile.cpp index b2a1971400..457e268224 100644 --- a/src/lib/OpenEXR/ImfTiledOutputFile.cpp +++ b/src/lib/OpenEXR/ImfTiledOutputFile.cpp @@ -1352,20 +1352,20 @@ TiledOutputFile::writeTiles (int dx1, int dx2, int dy1, int dy2, // } - // - // Exeption handling: - // - // TileBufferTask::execute() may have encountered exceptions, but - // those exceptions occurred in another thread, not in the thread - // that is executing this call to TiledOutputFile::writeTiles(). - // TileBufferTask::execute() has caught all exceptions and stored - // the exceptions' what() strings in the tile buffers. - // Now we check if any tile buffer contains a stored exception; if - // this is the case then we re-throw the exception in this thread. - // (It is possible that multiple tile buffers contain stored - // exceptions. We re-throw the first exception we find and - // ignore all others.) - // + // + // Exception handling: + // + // TileBufferTask::execute() may have encountered exceptions, but + // those exceptions occurred in another thread, not in the thread + // that is executing this call to TiledOutputFile::writeTiles(). + // TileBufferTask::execute() has caught all exceptions and stored + // the exceptions' what() strings in the tile buffers. + // Now we check if any tile buffer contains a stored exception; if + // this is the case then we re-throw the exception in this thread. + // (It is possible that multiple tile buffers contain stored + // exceptions. We re-throw the first exception we find and + // ignore all others.) + // const string *exception = 0; diff --git a/src/lib/OpenEXR/ImfTiledOutputFile.h b/src/lib/OpenEXR/ImfTiledOutputFile.h index 8ba1b9de1f..e1ece3b89c 100644 --- a/src/lib/OpenEXR/ImfTiledOutputFile.h +++ b/src/lib/OpenEXR/ImfTiledOutputFile.h @@ -311,7 +311,7 @@ class IMF_EXPORT_TYPE TiledOutputFile : public GenericOutputFile // dy must lie in the interval [0, numYTiles(ly) - 1] // // lx must lie in the interval [0, numXLevels() - 1] - // ly must lie in the inverval [0, numYLevels() - 1] + // ly must lie in the interval [0, numYLevels() - 1] // // writeTile(dx, dy, level) is a convenience function // used for ONE_LEVEL and MIPMAP_LEVEL files. It calls diff --git a/src/lib/OpenEXR/ImfTiledRgbaFile.h b/src/lib/OpenEXR/ImfTiledRgbaFile.h index 93880929ec..ca3f91392f 100644 --- a/src/lib/OpenEXR/ImfTiledRgbaFile.h +++ b/src/lib/OpenEXR/ImfTiledRgbaFile.h @@ -226,7 +226,7 @@ class IMF_EXPORT_TYPE TiledRgbaOutputFile // dy must lie in the interval [0, numYTiles(ly)-1] // // lx must lie in the interval [0, numXLevels()-1] - // ly must lie in the inverval [0, numYLevels()-1] + // ly must lie in the interval [0, numYLevels()-1] // // writeTile(dx, dy, level) is a convenience function // used for ONE_LEVEL and MIPMAP_LEVEL files. It calls @@ -476,7 +476,7 @@ class IMF_EXPORT_TYPE TiledRgbaInputFile // dy must lie in the interval [0, numYTiles(ly)-1] // // lx must lie in the interval [0, numXLevels()-1] - // ly must lie in the inverval [0, numYLevels()-1] + // ly must lie in the interval [0, numYLevels()-1] // // readTile(dx, dy, level) is a convenience function used // for ONE_LEVEL and MIPMAP_LEVELS files. It calls diff --git a/src/lib/OpenEXR/ImfWav.cpp b/src/lib/OpenEXR/ImfWav.cpp index 5e278602c9..019eff54a8 100644 --- a/src/lib/OpenEXR/ImfWav.cpp +++ b/src/lib/OpenEXR/ImfWav.cpp @@ -126,7 +126,7 @@ wav2Encode int p2 = 2; // == 1 << (level+1) // - // Hierachical loop on smaller dimension n + // Hierarchical loop on smaller dimension n // while (p2 <= n) diff --git a/src/lib/OpenEXR/dwaLookups.cpp b/src/lib/OpenEXR/dwaLookups.cpp index bd8eb69c74..6a90afc3f1 100644 --- a/src/lib/OpenEXR/dwaLookups.cpp +++ b/src/lib/OpenEXR/dwaLookups.cpp @@ -451,7 +451,7 @@ cpuCount() // // This gives us num_bits(input)-1 values per input. If we alloc // space for everything, that's like a 2MB table. We can do better -// by compressing all the values to be contigious and using offset +// by compressing all the values to be contiguous and using offset // pointers. // // After we've found the candidates with fewer bits set, sort them diff --git a/src/lib/OpenEXRCore/chunk.c b/src/lib/OpenEXRCore/chunk.c index 8014235c04..34ed2c4187 100644 --- a/src/lib/OpenEXRCore/chunk.c +++ b/src/lib/OpenEXRCore/chunk.c @@ -1332,12 +1332,12 @@ exr_read_chunk ( return pctxt->report_error ( pctxt, EXR_ERR_INVALID_ARGUMENT, - "mis-matched storage type for chunk block info"); + "mismatched storage type for chunk block info"); if (cinfo->compression != (uint8_t) part->comp_type) return pctxt->report_error ( pctxt, EXR_ERR_INVALID_ARGUMENT, - "mis-matched compression type for chunk block info"); + "mismatched compression type for chunk block info"); dataoffset = cinfo->data_offset; if (pctxt->file_size > 0 && dataoffset > (uint64_t) pctxt->file_size) @@ -1400,12 +1400,12 @@ exr_read_deep_chunk ( return pctxt->report_error ( pctxt, EXR_ERR_INVALID_ARGUMENT, - "mis-matched storage type for chunk block info"); + "mismatched storage type for chunk block info"); if (cinfo->compression != (uint8_t) part->comp_type) return pctxt->report_error ( pctxt, EXR_ERR_INVALID_ARGUMENT, - "mis-matched compression type for chunk block info"); + "mismatched compression type for chunk block info"); if (pctxt->file_size > 0 && cinfo->sample_count_data_offset > (uint64_t) pctxt->file_size) diff --git a/src/lib/OpenEXRCore/decoding.c b/src/lib/OpenEXRCore/decoding.c index e984fce70f..0e9a355726 100644 --- a/src/lib/OpenEXRCore/decoding.c +++ b/src/lib/OpenEXRCore/decoding.c @@ -231,7 +231,7 @@ decompress_data ( return pctxt->report_error ( pctxt, EXR_ERR_INVALID_ARGUMENT, - "no compresssion set but still trying to decompress"); + "no compression set but still trying to decompress"); case EXR_COMPRESSION_RLE: rv = internal_exr_undo_rle ( diff --git a/src/lib/OpenEXRCore/encoding.c b/src/lib/OpenEXRCore/encoding.c index c14edeb4f1..9bd213cedb 100644 --- a/src/lib/OpenEXRCore/encoding.c +++ b/src/lib/OpenEXRCore/encoding.c @@ -34,7 +34,7 @@ default_compress_chunk (exr_encode_pipeline_t* encode) return pctxt->report_error ( pctxt, EXR_ERR_INVALID_ARGUMENT, - "no compresssion set but still trying to compress"); + "no compression set but still trying to compress"); case EXR_COMPRESSION_RLE: rv = internal_exr_apply_rle (encode); break; case EXR_COMPRESSION_ZIP: diff --git a/src/lib/OpenEXRCore/internal_b44.c b/src/lib/OpenEXRCore/internal_b44.c index 0a07b9c633..824a9ff399 100644 --- a/src/lib/OpenEXRCore/internal_b44.c +++ b/src/lib/OpenEXRCore/internal_b44.c @@ -126,7 +126,7 @@ pack (const uint16_t s[16], uint8_t b[14], int flatfields, int exactmax) // // Compute a set of running differences, r[0] ... r[14]: // Find a shift value such that after rounding off the - // rightmost bits and shifting all differenes are between + // rightmost bits and shifting all differences are between // -32 and +31. Then bias the differences so that they // end up between 0 and 63. // diff --git a/src/lib/OpenEXRCore/internal_piz.c b/src/lib/OpenEXRCore/internal_piz.c index d9c407db05..3435d23a7a 100644 --- a/src/lib/OpenEXRCore/internal_piz.c +++ b/src/lib/OpenEXRCore/internal_piz.c @@ -177,7 +177,7 @@ wav_2D_encode (uint16_t* in, int nx, int ox, int ny, int oy, uint16_t mx) int p2 = 2; // == 1 << (level+1) // - // Hierachical loop on smaller dimension n + // Hierarchical loop on smaller dimension n // while (p2 <= n) diff --git a/src/lib/OpenEXRCore/validation.c b/src/lib/OpenEXRCore/validation.c index 3388cd908f..f64a8f2670 100644 --- a/src/lib/OpenEXRCore/validation.c +++ b/src/lib/OpenEXRCore/validation.c @@ -420,7 +420,7 @@ validate_part_type ( if (f->is_singlepart_tiled && curpart->storage_mode != EXR_STORAGE_TILED) { - // mis-match between type attr and file flag. c++ believed the + // mismatch between type attr and file flag. c++ believed the // flag first and foremost curpart->storage_mode = EXR_STORAGE_TILED; diff --git a/src/lib/OpenEXRUtil/ImfCheckFile.cpp b/src/lib/OpenEXRUtil/ImfCheckFile.cpp index f4ab515b97..7aa8288372 100644 --- a/src/lib/OpenEXRUtil/ImfCheckFile.cpp +++ b/src/lib/OpenEXRUtil/ImfCheckFile.cpp @@ -1217,9 +1217,9 @@ bool readCoreScanlinePart(exr_context_t f, int part, bool reduceMemory, bool red uint64_t bytes = 0; for (int c = 0; c < decoder.channel_count; c++) { - exr_coding_channel_info_t & outc = decoder.channels[c]; - // fake addr for default rouines - outc.decode_to_ptr = (uint8_t*)0x1000; + exr_coding_channel_info_t& outc = decoder.channels[c]; + // fake addr for default routines + outc.decode_to_ptr = (uint8_t*) 0x1000; outc.user_pixel_stride = outc.user_bytes_per_element; outc.user_line_stride = outc.user_pixel_stride * width; bytes += width * (uint64_t)outc.user_bytes_per_element * (uint64_t)lines_per_chunk; diff --git a/src/lib/OpenEXRUtil/ImfSampleCountChannel.h b/src/lib/OpenEXRUtil/ImfSampleCountChannel.h index f0f1ca9165..a16775a182 100644 --- a/src/lib/OpenEXRUtil/ImfSampleCountChannel.h +++ b/src/lib/OpenEXRUtil/ImfSampleCountChannel.h @@ -165,7 +165,7 @@ class IMFUTIL_EXPORT_TYPE SampleCountChannel : public ImageChannel // // Application code must take make sure that each call to beginEdit() // is followed by a corresponding endEdit() call, even if an - // exception occurs while the sample counts are acessed. In order to + // exception occurs while the sample counts are accessed. In order to // do that, application code may want to create a temporary Edit // object instead of calling beginEdit() and endEdit() directly. // diff --git a/src/lib/OpenEXRUtil/README b/src/lib/OpenEXRUtil/README index f415aa431d..751e7c95b4 100644 --- a/src/lib/OpenEXRUtil/README +++ b/src/lib/OpenEXRUtil/README @@ -68,7 +68,7 @@ each level of a deep image has a sample count channel with a single value per pixel; this value determines how many values each of the other channels in the same level has at the same pixel location. -The Image, ImageLevel and ImageChannel classes are abstact base classes. +The Image, ImageLevel and ImageChannel classes are abstract base classes. Two sets of classes, one for flat images and one for deep images, are derived from the base classes. The FlatImageChannel and DeepImageChannel classes, derived from ImageChannel, are themselves base classes for the