diff --git a/src/actions.cpp b/src/actions.cpp index 7f304ee0..446fa898 100644 --- a/src/actions.cpp +++ b/src/actions.cpp @@ -624,7 +624,7 @@ namespace Action { if ( Params::instance().binary_ && ( md.typeId() == Exiv2::undefined || md.typeId() == Exiv2::unsignedByte - || md.typeId() == Exiv2::signedByte) + || md.typeId() == Exiv2::signedByte) && md.size() > 100) { std::cout << _("(Binary value suppressed)") << std::endl; return; @@ -637,7 +637,7 @@ namespace Action { if ( Params::instance().binary_ && ( md.typeId() == Exiv2::undefined || md.typeId() == Exiv2::unsignedByte - || md.typeId() == Exiv2::signedByte) + || md.typeId() == Exiv2::signedByte) && md.size() > 100) { std::cout << _("(Binary value suppressed)") << std::endl; return; @@ -650,7 +650,7 @@ namespace Action { if ( Params::instance().binary_ && ( md.typeId() == Exiv2::undefined || md.typeId() == Exiv2::unsignedByte - || md.typeId() == Exiv2::signedByte) + || md.typeId() == Exiv2::signedByte) && md.size() > 100) { std::cout << _("(Binary value suppressed)") << std::endl; return; diff --git a/src/convert.cpp b/src/convert.cpp index bcc560bd..ac8d32af 100644 --- a/src/convert.cpp +++ b/src/convert.cpp @@ -1364,7 +1364,7 @@ namespace { std::string outstr; EXV_ICONV_CONST char *inptr = const_cast(str.c_str()); size_t inbytesleft = str.length(); - + while (inbytesleft) { char outbuf[100]; char *outptr = outbuf; @@ -1389,7 +1389,7 @@ namespace { if (cd != (iconv_t)(-1)) { iconv_close(cd); } - + if (ret) str = outstr; return ret; #else // !EXV_HAVE_ICONV diff --git a/src/exif.cpp b/src/exif.cpp index 838d17ff..bf5de5ac 100644 --- a/src/exif.cpp +++ b/src/exif.cpp @@ -316,7 +316,7 @@ namespace Exiv2 { { return key_.get() == 0 ? "" : key_->key(); } - + const char* Exifdatum::familyName() const { return key_.get() == 0 ? "" : key_->familyName(); diff --git a/src/exiv2.cpp b/src/exiv2.cpp index bc0fe7b2..34a215fe 100644 --- a/src/exiv2.cpp +++ b/src/exiv2.cpp @@ -81,7 +81,7 @@ namespace { int parseCommonTargets(const std::string& optarg, const std::string& action); - /*! + /*! @brief Parse numbers separated by commas into container @param previewNumbers Container for the numbers @param optarg Option arguments diff --git a/src/iptc.cpp b/src/iptc.cpp index e192f183..6b544b95 100644 --- a/src/iptc.cpp +++ b/src/iptc.cpp @@ -130,7 +130,7 @@ namespace Exiv2 { { return key_.get() == 0 ? 0 : key_->record(); } - + const char* Iptcdatum::familyName() const { return key_.get() == 0 ? "" : key_->familyName(); @@ -403,7 +403,7 @@ namespace Exiv2 { if (utf8) return "UTF-8"; return NULL; } - + const byte IptcParser::marker_ = 0x1C; // Dataset marker int IptcParser::decode( diff --git a/src/makernote.cpp b/src/makernote.cpp index 46ad5b85..2fcf7d57 100644 --- a/src/makernote.cpp +++ b/src/makernote.cpp @@ -205,7 +205,7 @@ namespace Exiv2 { Olympus2MnHeader::~Olympus2MnHeader() { } - + uint32_t Olympus2MnHeader::size() const { return header_.size_; diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp index c4d12bbe..9ecbe1d6 100644 --- a/src/nikonmn.cpp +++ b/src/nikonmn.cpp @@ -2,7 +2,7 @@ /* * Copyright (C) 2004-2009 Andreas Huggel * - * Lens database for the conversion of Nikon lens data to readable lens names + * Lens database for the conversion of Nikon lens data to readable lens names * Copyright (C) 2005-2008 Robert Rottmerhusen * * This program is part of the Exiv2 distribution. @@ -593,7 +593,7 @@ namespace Exiv2 { TagInfo(0x0e00, "PrintIM", N_("Print IM"), N_("PrintIM information"), nikon3IfdId, makerTags, undefined, printValue), // TODO: Add Capture Data decoding implementation. TagInfo(0x0e01, "CaptureData", N_("Capture Data"), N_("Capture data"), nikon3IfdId, makerTags, undefined, printValue), - TagInfo(0x0e09, "CaptureVersion", N_("Capture Version"), N_("Capture version"), nikon3IfdId, makerTags, asciiString, printValue), + TagInfo(0x0e09, "CaptureVersion", N_("Capture Version"), N_("Capture version"), nikon3IfdId, makerTags, asciiString, printValue), // TODO: Add Capture Offsets decoding implementation. TagInfo(0x0e0e, "CaptureOffsets", N_("Capture Offsets"), N_("Capture offsets"), nikon3IfdId, makerTags, undefined, printValue), TagInfo(0x0e10, "ScanIFD", "Scan IFD", N_("Scan IFD"), nikon3IfdId, makerTags, undefined, printValue), @@ -1629,12 +1629,12 @@ fmountlens[] = { {0x80,0x48,0x1A,0x1A,0x24,0x24,0x85,0x06,0x00,0x00, "Nikon", "JAA629DA", "AF DX Fisheye-Nikkor 10.5mm f/2.8G ED"}, {0x81,0x54,0x80,0x80,0x18,0x18,0x86,0x0E,0x03,0x00, "Nikon", "JAA336DA", "AF-S VR Nikkor 200mm f/2G IF-ED"}, {0x82,0x48,0x8E,0x8E,0x24,0x24,0x87,0x0E,0x03,0x00, "Nikon", "JAA337DA", "AF-S VR Nikkor 300mm f/2.8G IF-ED"}, -//83 -//84 -//85 +//83 +//84 +//85 //86 //87 -//88 +//88 {0x89,0x3C,0x53,0x80,0x30,0x3C,0x8B,0x06,0x00,0x00, "Nikon", "JAA793DA", "AF-S DX Zoom-Nikkor 55-200mm f/4-5.6G ED"}, {0x8A,0x54,0x6A,0x6A,0x24,0x24,0x8C,0x0E,0x03,0x00, "Nikon", "JAA630DA", "AF-S VR Micro-Nikkor 105mm f/2.8G IF-ED"}, {0x8B,0x40,0x2D,0x80,0x2C,0x3C,0x8D,0x0E,0x00,0x00, "Nikon", "JAA794DA", "AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED"}, @@ -1881,7 +1881,7 @@ fmountlens[] = { {0x7A,0x3C,0x1F,0x37,0x30,0x30,0x7E,0x06,0x00,0x03, "Tokina", "T4122423", "AT-X 124 AF PRO DX II (AF 12-24mm f/4)"}, {0x00,0x48,0x29,0x50,0x24,0x24,0x00,0x06,0x00,0x03, "Tokina", "", "AT-X 165 PRO DX (AF 16-50mm f/2.8)"}, {0x00,0x40,0x2A,0x72,0x2C,0x3C,0x00,0x06,0x00,0x03, "Tokina", "", "AT-X 16.5-135 DX (AF 16.5-135mm F3.5-5.6)"}, -// "Tokina" "" "AF 193 (AF 19-35mm f/3.5-4.5)"; +// "Tokina" "" "AF 193 (AF 19-35mm f/3.5-4.5)"; {0x2F,0x48,0x30,0x44,0x24,0x24,0x29,0x02,0x00,0x03, "Tokina", "", "AT-X 235 AF PRO (AF 20-35mm f/2.8)"}, // "Tokina" "" "AF 235 (AF 20-35mm f/3.5-4.5)"; {0x2F,0x40,0x30,0x44,0x2C,0x34,0x29,0x02,0x00,0x03, "Tokina", "", "AF 235 II (AF 20-35mm f/3.5-4.5)"}, @@ -1918,10 +1918,10 @@ fmountlens[] = { {0x06,0x3F,0x68,0x68,0x2C,0x2C,0x06,0x00,0x00,0x04, "Cosina", "", "AF 100mm F3.5 Macro"}, {0x07,0x36,0x3D,0x5F,0x2C,0x3C,0x03,0x00,0x00,0x04, "Cosina", "", "AF Zoom 28-80mm F3.5-5.6 MC Macro"}, {0x07,0x46,0x3D,0x6A,0x25,0x2F,0x03,0x00,0x00,0x04, "Cosina", "", "AF Zoom 28-105mm F2.8-3.8 MC"}, -// "Cosina" "" "AF Zoom 28-210mm F3.5-5.6"; +// "Cosina" "" "AF Zoom 28-210mm F3.5-5.6"; // "Cosina" "" "AF Zoom 28-210mm F4.2-6.5 Aspherical IF"; -// "Cosina" "" "AF Zoom 28-300mm F4.0-6.3"; -// "Cosina" "" "AF Zoom 70-210mm F2.8-4.0"; +// "Cosina" "" "AF Zoom 28-300mm F4.0-6.3"; +// "Cosina" "" "AF Zoom 70-210mm F2.8-4.0"; {0x12,0x36,0x5C,0x81,0x35,0x3D,0x09,0x00,0x00,0x04, "Cosina", "", "AF Zoom 70-210mm F4.5-5.6 MC Macro"}, {0x12,0x39,0x5C,0x8E,0x34,0x3D,0x08,0x02,0x00,0x04, "Cosina", "", "AF Zoom 70-300mm F4.5-5.6 MC Macro"}, {0x12,0x3B,0x68,0x8D,0x3D,0x43,0x09,0x02,0x00,0x04, "Cosina", "", "AF Zoom 100-300mm F5.6-6.7 MC Macro"}, diff --git a/src/properties.cpp b/src/properties.cpp index 411b46c5..ef7eb88d 100644 --- a/src/properties.cpp +++ b/src/properties.cpp @@ -962,7 +962,7 @@ namespace Exiv2 { {"Xmp.plus.LicensorTelephoneType1", EXV_PRINT_VOCABULARY(plusLicensorTelephoneType) }, {"Xmp.plus.LicensorTelephoneType2", EXV_PRINT_VOCABULARY(plusLicensorTelephoneType) }, {"Xmp.plus.MinorModelAgeDisclosure", EXV_PRINT_VOCABULARY(plusMinorModelAgeDisclosure) }, - {"Xmp.plus.ModelReleaseStatus", EXV_PRINT_VOCABULARY(plusModelReleaseStatus) }, + {"Xmp.plus.ModelReleaseStatus", EXV_PRINT_VOCABULARY(plusModelReleaseStatus) }, {"Xmp.plus.PropertyReleaseStatus", EXV_PRINT_VOCABULARY(plusPropertyReleaseStatus) }, {"Xmp.plus.Reuse", EXV_PRINT_VOCABULARY(plusReuse) } }; diff --git a/src/psdimage.cpp b/src/psdimage.cpp index 5630da49..42685178 100644 --- a/src/psdimage.cpp +++ b/src/psdimage.cpp @@ -347,7 +347,7 @@ namespace Exiv2 { // Write Photoshop header data out to new PSD file if (outIo.write(psd_head, 26) != 26) throw Error(21); - // Read colorDataLength from original PSD + // Read colorDataLength from original PSD if (io_->read(buf, 4) != 4) throw Error(3, "Photoshop"); uint32_t colorDataLength = getULong(buf, bigEndian); @@ -413,7 +413,7 @@ namespace Exiv2 { != static_cast(adjResourceNameLen)) throw Error(3, "Photoshop"); // read resource size (actual length w/o padding!) - if (io_->read(buf, 4) != 4) throw Error(3, "Photoshop"); + if (io_->read(buf, 4) != 4) throw Error(3, "Photoshop"); uint32_t resourceSize = getULong(buf, bigEndian); uint32_t curOffset = io_->tell(); diff --git a/src/rw2image.cpp b/src/rw2image.cpp index 24114dca..6c79c205 100644 --- a/src/rw2image.cpp +++ b/src/rw2image.cpp @@ -159,7 +159,7 @@ namespace Exiv2 { std::cerr << "Filtering duplicate tag " << pos->key() << " (values '" << pos->value() << "' and '" << dup->value() << "')\n"; -#endif +#endif prevData.erase(dup); } } diff --git a/src/tiffcomposite_int.hpp b/src/tiffcomposite_int.hpp index 53b543a1..8e99d6d1 100644 --- a/src/tiffcomposite_int.hpp +++ b/src/tiffcomposite_int.hpp @@ -97,7 +97,7 @@ namespace Exiv2 { const uint16_t subimg2 = 9; //!< 2nd TIFF SubIFD in IFD0 const uint16_t subimg3 = 10; //!< 3rd TIFF SubIFD in IFD0 const uint16_t subimg4 = 11; //!< 4th TIFF SubIFD in IFD0 - const uint16_t panaraw = 64; //!< IFD0 of Panasonic RAW images + const uint16_t panaraw = 64; //!< IFD0 of Panasonic RAW images const uint16_t mn = 256; //!< Makernote const uint16_t ignr = 511; //!< Read but do not decode } @@ -114,7 +114,7 @@ namespace Exiv2 { const uint32_t all = 0x40000; //!< Special tag: all tags in a group const uint32_t pana = 0x80000; //!< Special tag: root IFD of Panasonic RAW images } - + /*! @brief A tupel consisting of extended Tag and group used as an item in TIFF paths. @@ -773,7 +773,7 @@ namespace Exiv2 { Return the number of bytes written. This function writes the image data to the data area of the current - directory. It is used for TIFF image entries in the makernote (large + directory. It is used for TIFF image entries in the makernote (large preview images) so that the image data remains in the makernote IFD. */ virtual uint32_t doWriteData(IoWrapper& ioWrapper, diff --git a/src/tiffimage.hpp b/src/tiffimage.hpp index 52f6e7d0..cc1194b6 100644 --- a/src/tiffimage.hpp +++ b/src/tiffimage.hpp @@ -105,7 +105,7 @@ namespace Exiv2 { //! @name Accessors //@{ - //! Return the group name of the group with the primary image. + //! Return the group name of the group with the primary image. std::string primaryGroup() const; //@} diff --git a/src/tiffvisitor.cpp b/src/tiffvisitor.cpp index 2d6233b7..0e41d114 100644 --- a/src/tiffvisitor.cpp +++ b/src/tiffvisitor.cpp @@ -1002,7 +1002,7 @@ namespace Exiv2 { /* What follows is a hack. I can't think of a better way to set - the makernote byte order (and other properties maybe) in the + the makernote byte order (and other properties maybe) in the makernote header during intrusive writing. The thing is that visit/encodeIfdMakernote is not called in this case and there can't be an Exif tag which corresponds to this component. diff --git a/src/tiffvisitor_int.hpp b/src/tiffvisitor_int.hpp index 6005dd05..a02d40c2 100644 --- a/src/tiffvisitor_int.hpp +++ b/src/tiffvisitor_int.hpp @@ -367,7 +367,7 @@ namespace Exiv2 { virtual void visitIfdMakernoteEnd(TiffIfdMakernote* object); //! Encode a binary array virtual void visitBinaryArray(TiffBinaryArray* object); - //! Re-encrypt binary array if necessary + //! Re-encrypt binary array if necessary virtual void visitBinaryArrayEnd(TiffBinaryArray* object); //! Encode an element of a binary array virtual void visitBinaryElement(TiffBinaryElement* object); @@ -627,7 +627,7 @@ namespace Exiv2 { */ void postProcess(); //@} - + //! @name Accessors //@{ //! Return the byte order.