From 39a4b9b9308de48f9fb7de489cf6c2d0c6571232 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Sun, 18 Jun 2023 12:04:32 +0000 Subject: [PATCH] Fix various typos Found via `codespell -q 3 -S *.po,*.pot,*.ts,./doc/ChangeLog,./xmpsdk -L alis,discus,filetest,ist,nd,ois,optio,siz,te,tempdate` Excluded 3rd-party code (ie ./xmpsdk) --- README.md | 4 ++-- ci/test_build.py | 2 +- include/exiv2/image.hpp | 2 +- include/exiv2/matroskavideo.hpp | 2 +- include/exiv2/photoshop.hpp | 4 ++-- include/exiv2/quicktimevideo.hpp | 4 ++-- include/exiv2/value.hpp | 8 ++++---- samples/easyaccess-test.cpp | 2 +- src/asfvideo.cpp | 2 +- src/basicio.cpp | 4 ++-- src/panasonicmn_int.cpp | 4 ++-- src/pngchunk_int.cpp | 2 +- src/pngchunk_int.hpp | 2 +- src/quicktimevideo.cpp | 8 ++++---- src/rafimage.cpp | 2 +- src/riffvideo.cpp | 2 +- src/tags_int.cpp | 4 ++-- src/tiffcomposite_int.hpp | 4 ++-- src/tiffimage_int.cpp | 4 ++-- src/xmpsidecar.cpp | 4 ++-- test/data/test_reference_files/test_pr_1905_poc1_ref.out | 2 +- tests/bash_tests/testcases.py | 2 +- unitTests/test_slice.cpp | 2 +- 23 files changed, 38 insertions(+), 38 deletions(-) diff --git a/README.md b/README.md index f0c147ae..c70115c2 100644 --- a/README.md +++ b/README.md @@ -161,7 +161,7 @@ Available configure presets: "linux-release" - Linux Release with default architecture ``` -The project configuration with a specific preset can be choosen with the CMake `--preset` option. In the following terminal output we comment out some interesting things happening during the project configuration: +The project configuration with a specific preset can be chosen with the CMake `--preset` option. In the following terminal output we comment out some interesting things happening during the project configuration: ```bash # Configuring the project using a preset @@ -509,7 +509,7 @@ The tag webpage build files are in the `/doc/templates` directory. If tag groups in the Exiv2 source code then the build files need to be updated. Any changes made to individual tags in an existing tag group are automatically included. -Building the tag webpages requires building the Exiv2 sample programs and using scripts which have additional dependancies on +Building the tag webpages requires building the Exiv2 sample programs and using scripts which have additional dependencies on [BASH](https://www.gnu.org/software/bash/), [make](https://manpages.org/make), [xsltproc](https://manpages.org/xsltproc) and [Python3](https://www.python.org/). diff --git a/ci/test_build.py b/ci/test_build.py index b7fe117b..435f074f 100644 --- a/ci/test_build.py +++ b/ci/test_build.py @@ -79,7 +79,7 @@ if __name__ == '__main__': description="Build and test exiv2 using a matrix of build switches") parser.add_argument( "--compilers", - help="Compilers to be used to build exiv2 (when none ore specified, " + help="Compilers to be used to build exiv2 (when none are specified, " "then the default compiler will be used)", nargs='*', default=["gcc", "clang"], diff --git a/include/exiv2/image.hpp b/include/exiv2/image.hpp index 66f14870..629a8a4f 100644 --- a/include/exiv2/image.hpp +++ b/include/exiv2/image.hpp @@ -409,7 +409,7 @@ class EXIV2API Image { /*! @brief Return a reference to the BasicIo instance being used for Io. - This refence is particularly useful to reading the results of + This reference is particularly useful to reading the results of operations on a MemIo instance. For example after metadata has been modified and the writeMetadata() method has been called, this method can be used to get access to the modified image. diff --git a/include/exiv2/matroskavideo.hpp b/include/exiv2/matroskavideo.hpp index 070c1afc..6861fc4c 100644 --- a/include/exiv2/matroskavideo.hpp +++ b/include/exiv2/matroskavideo.hpp @@ -128,7 +128,7 @@ class EXIV2API MatroskaVideo : public Image { protected: /*! - @brief Function used to calulate the size of a block. + @brief Function used to calculate the size of a block. This information is only stored in one byte. The size of the block is calculated by counting the number of leading zeros in the binary code of the byte. diff --git a/include/exiv2/photoshop.hpp b/include/exiv2/photoshop.hpp index 4b140401..93ee64f3 100644 --- a/include/exiv2/photoshop.hpp +++ b/include/exiv2/photoshop.hpp @@ -34,9 +34,9 @@ struct EXIV2API Photoshop { /// @return true if all IRBs are valid;
false otherwise static bool valid(const byte* pPsData, size_t sizePsData); - /// @brief Locates the data for a %Photoshop tag in a %Photoshop formated memory buffer. + /// @brief Locates the data for a %Photoshop tag in a %Photoshop formatted memory buffer. /// Operates on raw data to simplify reuse. - /// @param pPsData Pointer to buffer containing entire payload of %Photoshop formated data (from APP13 Jpeg segment) + /// @param pPsData Pointer to buffer containing entire payload of %Photoshop formatted data (from APP13 Jpeg segment) /// @param sizePsData Size in bytes of pPsData. /// @param psTag %Tag number of the block to look for. /// @param record Output value that is set to the start of the data block within pPsData (may not be null). diff --git a/include/exiv2/quicktimevideo.hpp b/include/exiv2/quicktimevideo.hpp index 84687d88..3d3d23bd 100644 --- a/include/exiv2/quicktimevideo.hpp +++ b/include/exiv2/quicktimevideo.hpp @@ -77,7 +77,7 @@ class EXIV2API QuickTimeVideo : public Image { to save it in the respective XMP container. Decodes a Tag Information and saves it in the respective XMP container, if the block size is small. - @param buf Data buffer which cotains tag ID. + @param buf Data buffer which contains tag ID. @param size Size of the data block used to store Tag Information. */ void tagDecoder(Exiv2::DataBuf& buf, size_t size); @@ -195,7 +195,7 @@ class EXIV2API QuickTimeVideo : public Image { //! Variable which stores Time Scale unit, used to calculate time. uint64_t timeScale_ = 0; - //! Variable which stores current stream being processsed. + //! Variable which stores current stream being processed. int currentStream_ = 0; //! Variable to check the end of metadata traversing. bool continueTraversing_ = false; diff --git a/include/exiv2/value.hpp b/include/exiv2/value.hpp index 9c4e5309..ed9edf62 100644 --- a/include/exiv2/value.hpp +++ b/include/exiv2/value.hpp @@ -961,13 +961,13 @@ class EXIV2API DateValue : public Value { size_t count() const override; size_t size() const override; std::ostream& write(std::ostream& os) const override; - //! Return the value as a UNIX calender time converted to int64_t. + //! Return the value as a UNIX calendar time converted to int64_t. int64_t toInt64(size_t n = 0) const override; - //! Return the value as a UNIX calender time converted to uint32_t. + //! Return the value as a UNIX calendar time converted to uint32_t. uint32_t toUint32(size_t n = 0) const override; - //! Return the value as a UNIX calender time converted to float. + //! Return the value as a UNIX calendar time converted to float. float toFloat(size_t n = 0) const override; - //! Return the value as a UNIX calender time converted to Rational. + //! Return the value as a UNIX calendar time converted to Rational. Rational toRational(size_t n = 0) const override; //@} diff --git a/samples/easyaccess-test.cpp b/samples/easyaccess-test.cpp index c33fe43f..38d9fce9 100644 --- a/samples/easyaccess-test.cpp +++ b/samples/easyaccess-test.cpp @@ -99,7 +99,7 @@ int main(int argc, char** argv) { } } if (!categoryOk) { - std::cout << "Categoy >" << argv[i] << "< is invalid.\n"; + std::cout << "Category >" << argv[i] << "< is invalid.\n"; return EXIT_FAILURE; } } diff --git a/src/asfvideo.cpp b/src/asfvideo.cpp index aa613113..0c7d22c6 100644 --- a/src/asfvideo.cpp +++ b/src/asfvideo.cpp @@ -20,7 +20,7 @@ namespace Exiv2 { /*! Look-up list for ASF Type Video Files Associates the GUID with its Name(i.e. Human Readable Form) - Tags have been diferentiated into Various Categories. + Tags have been differentiated into Various Categories. The categories have been listed above Groups see : - https://fr.wikipedia.org/wiki/Advanced_Systems_Format diff --git a/src/basicio.cpp b/src/basicio.cpp index 9ab953a3..e3532a0f 100644 --- a/src/basicio.cpp +++ b/src/basicio.cpp @@ -1708,14 +1708,14 @@ size_t CurlIo::write(const byte* data, size_t wcount) { if (p_->protocol_ == pHttp || p_->protocol_ == pHttps) { return RemoteIo::write(data, wcount); } - throw Error(ErrorCode::kerErrorMessage, "doesnt support write for this protocol."); + throw Error(ErrorCode::kerErrorMessage, "does not support write for this protocol."); } size_t CurlIo::write(BasicIo& src) { if (p_->protocol_ == pHttp || p_->protocol_ == pHttps) { return RemoteIo::write(src); } - throw Error(ErrorCode::kerErrorMessage, "doesnt support write for this protocol."); + throw Error(ErrorCode::kerErrorMessage, "does not support write for this protocol."); } CurlIo::CurlIo(const std::string& url, size_t blockSize) { diff --git a/src/panasonicmn_int.cpp b/src/panasonicmn_int.cpp index 5a35ffb7..71dfa8bc 100644 --- a/src/panasonicmn_int.cpp +++ b/src/panasonicmn_int.cpp @@ -421,9 +421,9 @@ constexpr TagInfo PanasonicMakerNote::tagInfo_[] = { SectionId::makerTags, unsignedShort, -1, printAccelerometer}, {0x008f, "CameraOrientation", N_("Camera Orientation"), N_("Camera Orientation"), IfdId::panasonicId, SectionId::makerTags, unsignedByte, -1, EXV_PRINT_TAG(panasonicCameraOrientation)}, - {0x0090, "RollAngle", N_("Roll Angle"), N_("degress of clockwise camera rotation"), IfdId::panasonicId, + {0x0090, "RollAngle", N_("Roll Angle"), N_("degrees of clockwise camera rotation"), IfdId::panasonicId, SectionId::makerTags, unsignedShort, -1, printRollAngle}, - {0x0091, "PitchAngle", N_("Pitch Angle"), N_("degress of upwards camera tilt"), IfdId::panasonicId, + {0x0091, "PitchAngle", N_("Pitch Angle"), N_("degrees of upwards camera tilt"), IfdId::panasonicId, SectionId::makerTags, unsignedShort, -1, printPitchAngle}, {0x0093, "SweepPanoramaDirection", N_("Sweep Panorama Direction"), N_("Sweep Panorama Direction"), IfdId::panasonicId, SectionId::makerTags, unsignedByte, -1, EXV_PRINT_TAG(panasonicSweepPanoramaDirection)}, diff --git a/src/pngchunk_int.cpp b/src/pngchunk_int.cpp index 81fbcd94..aa392390 100644 --- a/src/pngchunk_int.cpp +++ b/src/pngchunk_int.cpp @@ -29,7 +29,7 @@ /* -URLs to find informations about PNG chunks : +URLs to find information about PNG chunks : tEXt and zTXt chunks : http://www.vias.org/pngguide/chapter11_04.html iTXt chunk : http://www.vias.org/pngguide/chapter11_05.html diff --git a/src/pngchunk_int.hpp b/src/pngchunk_int.hpp index 1553758e..977bb7e3 100644 --- a/src/pngchunk_int.hpp +++ b/src/pngchunk_int.hpp @@ -64,7 +64,7 @@ class PngChunk { /*! @brief Return a complete PNG chunk data compressed or not as buffer. - Data returned is formated accordingly with metadata \em type + Data returned is formatted accordingly with metadata \em type to host passed by \em metadata. @param metadata metadata buffer. diff --git a/src/quicktimevideo.cpp b/src/quicktimevideo.cpp index 0e4c87a0..ee298dd9 100644 --- a/src/quicktimevideo.cpp +++ b/src/quicktimevideo.cpp @@ -1050,7 +1050,7 @@ void QuickTimeVideo::NikonTagsDecoder(size_t size_external) { // Sanity check with an "unreasonably" large number if (dataLength > 200 || dataLength < 4) { #ifndef SUPPRESS_WARNINGS - EXV_ERROR << "Xmp.video Nikon Tags, dataLength was found to be of inapropriate size." + EXV_ERROR << "Xmp.video Nikon Tags, dataLength was found to be of inappropriate size." << " Entries considered invalid. Not Processed.\n"; #endif io_->seek(io_->tell() + dataLength - 4, BasicIo::beg); @@ -1066,7 +1066,7 @@ void QuickTimeVideo::NikonTagsDecoder(size_t size_external) { // Sanity check with an "unreasonably" large number if (dataLength > 200 || dataLength < 2) { #ifndef SUPPRESS_WARNINGS - EXV_ERROR << "Xmp.video Nikon Tags, dataLength was found to be of inapropriate size." + EXV_ERROR << "Xmp.video Nikon Tags, dataLength was found to be of inappropriate size." << " Entries considered invalid. Not Processed.\n"; #endif io_->seek(io_->tell() + dataLength - 2, BasicIo::beg); @@ -1084,7 +1084,7 @@ void QuickTimeVideo::NikonTagsDecoder(size_t size_external) { // Sanity check with an "unreasonably" large number if (dataLength > 200 || dataLength < 8) { #ifndef SUPPRESS_WARNINGS - EXV_ERROR << "Xmp.video Nikon Tags, dataLength was found to be of inapropriate size." + EXV_ERROR << "Xmp.video Nikon Tags, dataLength was found to be of inappropriate size." << " Entries considered invalid. Not Processed.\n"; #endif io_->seek(io_->tell() + dataLength - 8, BasicIo::beg); @@ -1102,7 +1102,7 @@ void QuickTimeVideo::NikonTagsDecoder(size_t size_external) { // Sanity check with an "unreasonably" large number if (dataLength > 200 || dataLength < 4) { #ifndef SUPPRESS_WARNINGS - EXV_ERROR << "Xmp.video Nikon Tags, dataLength was found to be of inapropriate size." + EXV_ERROR << "Xmp.video Nikon Tags, dataLength was found to be of inappropriate size." << " Entries considered invalid. Not Processed.\n"; #endif io_->seek(io_->tell() + dataLength - 4, BasicIo::beg); diff --git a/src/rafimage.cpp b/src/rafimage.cpp index e18e852f..72cc2845 100644 --- a/src/rafimage.cpp +++ b/src/rafimage.cpp @@ -259,7 +259,7 @@ void RafImage::readMetadata() { throw Error(ErrorCode::kerFailedToReadImageData); } - // Retreive metadata from embedded JPEG preview image. + // Retrieve metadata from embedded JPEG preview image. try { auto jpg_io = std::make_unique(jpg_buf.data(), jpg_buf.size()); auto jpg_img = JpegImage(std::move(jpg_io), false); diff --git a/src/riffvideo.cpp b/src/riffvideo.cpp index 80b66aff..2b55ed28 100644 --- a/src/riffvideo.cpp +++ b/src/riffvideo.cpp @@ -165,7 +165,7 @@ const std::map audioEncodingValues = { {0x64, "APICOM G.726 ADPCM"}, {0x65, "APICOM G.722 ADPCM"}, {0x66, "Microsoft DSAT"}, - {0x67, "Micorsoft DSAT DISPLAY"}, + {0x67, "Microsoft DSAT DISPLAY"}, {0x69, "Voxware Byte Aligned"}, {0x70, "Voxware AC8"}, {0x71, "Voxware AC10"}, diff --git a/src/tags_int.cpp b/src/tags_int.cpp index 62814bee..41fe2246 100644 --- a/src/tags_int.cpp +++ b/src/tags_int.cpp @@ -2243,7 +2243,7 @@ constexpr TagInfo mpfTagInfo[] = { unsignedLong, 1, printValue}, {0xb201, "MPFPanOrientation", N_("MPFPanOrientation"), N_("MPFPanOrientation"), IfdId::mpfId, SectionId::mpfTags, unsignedLong, 1, printValue}, - {0xb202, "MPFPanOverlapH", N_("MPFPanOverlapH"), N_("MPF Pan Overlap Horizonal"), IfdId::mpfId, SectionId::mpfTags, + {0xb202, "MPFPanOverlapH", N_("MPFPanOverlapH"), N_("MPF Pan Overlap Horizontal"), IfdId::mpfId, SectionId::mpfTags, unsignedLong, 1, printValue}, {0xb203, "MPFPanOverlapV", N_("MPFPanOverlapV"), N_("MPF Pan Overlap Vertical"), IfdId::mpfId, SectionId::mpfTags, unsignedLong, 1, printValue}, @@ -2954,7 +2954,7 @@ std::ostream& print0xa217(std::ostream& os, const Value& value, const ExifData* //! FileSource, tag 0xa300 constexpr TagDetails exifFileSource[] = { {1, N_("Film scanner")}, // Not defined to Exif 2.2 spec. - {2, N_("Reflexion print scanner")}, // but used by some scanner device softwares. + {2, N_("Reflexion print scanner")}, // but used by some scanner device software. {3, N_("Digital still camera")}, }; diff --git a/src/tiffcomposite_int.hpp b/src/tiffcomposite_int.hpp index 3672db5c..4506a4dc 100644 --- a/src/tiffcomposite_int.hpp +++ b/src/tiffcomposite_int.hpp @@ -56,7 +56,7 @@ const uint32_t cmt4 = 0x130000; //!< Special tag: root IFD of CR3 images } // namespace Tag /*! - @brief A tupel consisting of extended Tag and group used as an item in + @brief A tuple consisting of extended Tag and group used as an item in TIFF paths. */ class TiffPathItem { @@ -145,7 +145,7 @@ class IoWrapper { @brief Interface class for components of a TIFF directory hierarchy (Composite pattern). Both TIFF directories as well as entries implement this interface. A component can be uniquely identified - by a tag, group tupel. This class is implemented as a NVI + by a tag, group tuple. This class is implemented as a NVI (Non-Virtual Interface) and it has an interface for visitors (Visitor pattern) to perform operations on all components. */ diff --git a/src/tiffimage_int.cpp b/src/tiffimage_int.cpp index e62c5228..31f5f898 100644 --- a/src/tiffimage_int.cpp +++ b/src/tiffimage_int.cpp @@ -173,7 +173,7 @@ constexpr ArrayCfg canonLeCfg = { {0, ttSignedLong, 1}, }; -//! Canon Ambience Selction Info binary array - configuration +//! Canon Ambience Selection Info binary array - configuration constexpr ArrayCfg canonAmCfg = { IfdId::canonAmId, // Group for the elements invalidByteOrder, // Use byte order from parent @@ -185,7 +185,7 @@ constexpr ArrayCfg canonAmCfg = { {0, ttSignedLong, 1}, }; -//! Canon MultiExposure Selction Info binary array - configuration +//! Canon MultiExposure Selection Info binary array - configuration constexpr ArrayCfg canonMeCfg = { IfdId::canonMeId, // Group for the elements invalidByteOrder, // Use byte order from parent diff --git a/src/xmpsidecar.cpp b/src/xmpsidecar.cpp index 181f7c27..d4cbd8c6 100644 --- a/src/xmpsidecar.cpp +++ b/src/xmpsidecar.cpp @@ -100,7 +100,7 @@ void XmpSidecar::writeMetadata() { } } - // run the convertors + // run the converters copyExifToXmp(exifData_, xmpData_); copyIptcToXmp(iptcData_, xmpData_); @@ -116,7 +116,7 @@ void XmpSidecar::writeMetadata() { } } - // #589 - restore tags which were modified by the convertors + // #589 - restore tags which were modified by the converters for (const auto& xmp : copy) { xmpData_[xmp.key()] = xmp.value(); } diff --git a/test/data/test_reference_files/test_pr_1905_poc1_ref.out b/test/data/test_reference_files/test_pr_1905_poc1_ref.out index 8aee39d3..73c726d2 100644 --- a/test/data/test_reference_files/test_pr_1905_poc1_ref.out +++ b/test/data/test_reference_files/test_pr_1905_poc1_ref.out @@ -371,7 +371,7 @@ MPFImageUIDList,45059,0xb003,MpfInfo,Exif.MpfInfo.MPFImageUIDList,Long,"MPF Imag MPFTotalFrames,45060,0xb004,MpfInfo,Exif.MpfInfo.MPFTotalFrames,Long,"MPF Total Frames" MPFIndividualNum,45313,0xb101,MpfInfo,Exif.MpfInfo.MPFIndividualNum,Long,"MPF Individual Num" MPFPanOrientation,45569,0xb201,MpfInfo,Exif.MpfInfo.MPFPanOrientation,Long,"MPFPanOrientation" -MPFPanOverlapH,45570,0xb202,MpfInfo,Exif.MpfInfo.MPFPanOverlapH,Long,"MPF Pan Overlap Horizonal" +MPFPanOverlapH,45570,0xb202,MpfInfo,Exif.MpfInfo.MPFPanOverlapH,Long,"MPF Pan Overlap Horizontal" MPFPanOverlapV,45571,0xb203,MpfInfo,Exif.MpfInfo.MPFPanOverlapV,Long,"MPF Pan Overlap Vertical" MPFBaseViewpointNum,45572,0xb204,MpfInfo,Exif.MpfInfo.MPFBaseViewpointNum,Long,"MPF Base Viewpoint Number" MPFConvergenceAngle,45573,0xb205,MpfInfo,Exif.MpfInfo.MPFConvergenceAngle,Long,"MPF Convergence Angle" diff --git a/tests/bash_tests/testcases.py b/tests/bash_tests/testcases.py index 2c5680d9..437f900e 100644 --- a/tests/bash_tests/testcases.py +++ b/tests/bash_tests/testcases.py @@ -729,7 +729,7 @@ set Exif.Photo.DateTimeDigitized 2020:05:26 07:31:42 out += '' # Corner case check (ISO value indicating possible overflow, - # but no additional informations available) + # but no additional information available) # input: # - Exif.Photo.ISOSpeedRatings being set to 65535 # - Exif.Photo.SensitivityType NOT SET diff --git a/unitTests/test_slice.cpp b/unitTests/test_slice.cpp index 7f5231e7..dacf5811 100644 --- a/unitTests/test_slice.cpp +++ b/unitTests/test_slice.cpp @@ -12,7 +12,7 @@ template class slice; /*! - * This namespace contains the helper-function get_test_data. It is intented + * This namespace contains the helper-function get_test_data. It is intended * to be used for test with the slice fixture: it returns the appropriate * data to the constructor of slice. For (const) T==std::vector it returns the * fixtures member vec_, for (const) T==int* it returns vec_.data()