Skip to content

Commit

Permalink
Fix various typos
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
luzpaz authored and kmilos committed Jun 18, 2023
1 parent 3202e86 commit 39a4b9b
Show file tree
Hide file tree
Showing 23 changed files with 38 additions and 38 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -509,7 +509,7 @@ The tag webpage build files are in the `<exiv2dir>/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/).

Expand Down
2 changes: 1 addition & 1 deletion ci/test_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def run(cmd):
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"],
Expand Down
2 changes: 1 addition & 1 deletion include/exiv2/image.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion include/exiv2/matroskavideo.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions include/exiv2/photoshop.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ struct EXIV2API Photoshop {
/// @return true if all IRBs are valid;<BR> 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).
Expand Down
4 changes: 2 additions & 2 deletions include/exiv2/quicktimevideo.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions include/exiv2/value.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
//@}

Expand Down
2 changes: 1 addition & 1 deletion samples/easyaccess-test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/asfvideo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/basicio.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions src/panasonicmn_int.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)},
Expand Down
2 changes: 1 addition & 1 deletion src/pngchunk_int.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/pngchunk_int.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions src/quicktimevideo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/rafimage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<Exiv2::MemIo>(jpg_buf.data(), jpg_buf.size());
auto jpg_img = JpegImage(std::move(jpg_io), false);
Expand Down
2 changes: 1 addition & 1 deletion src/riffvideo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ const std::map<uint16_t, std::string> 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"},
Expand Down
4 changes: 2 additions & 2 deletions src/tags_int.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down Expand Up @@ -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")},
};

Expand Down
4 changes: 2 additions & 2 deletions src/tiffcomposite_int.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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.
*/
Expand Down
4 changes: 2 additions & 2 deletions src/tiffimage_int.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/xmpsidecar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ void XmpSidecar::writeMetadata() {
}
}

// run the convertors
// run the converters
copyExifToXmp(exifData_, xmpData_);
copyIptcToXmp(iptcData_, xmpData_);

Expand All @@ -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();
}
Expand Down
2 changes: 1 addition & 1 deletion test/data/test_reference_files/test_pr_1905_poc1_ref.out
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion tests/bash_tests/testcases.py
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,7 @@ def iso65k_test(self):
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
Expand Down
2 changes: 1 addition & 1 deletion unitTests/test_slice.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ template <typename T>
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()
Expand Down

0 comments on commit 39a4b9b

Please sign in to comment.