diff --git a/src/actions.cpp b/src/actions.cpp index 4084949f..5bbb7454 100644 --- a/src/actions.cpp +++ b/src/actions.cpp @@ -121,7 +121,7 @@ namespace { @brief Rename a file according to a timestamp value. @param path The original file path. Contains the new path on exit. - @param tm Pointer to a buffer with the broken-down time to rename + @param tm Pointer to a buffer with the broken-down time to rename the file to. @return 0 if successful, -1 if the file was skipped, 1 on error. */ @@ -719,8 +719,8 @@ namespace Action { rc = renameFile(newPath, &tm); if (rc == -1) return 0; // skip } - if ( 0 == rc - && ( Params::instance().preserve_ + if ( 0 == rc + && ( Params::instance().preserve_ || Params::instance().timestamp_ || Params::instance().timestampOnly_)) { ts.touch(newPath); @@ -1024,9 +1024,9 @@ namespace Action { if (!Params::instance().jpegComment_.empty()) { if (Params::instance().verbose_) { - std::cout << "Setting Jpeg comment '" + std::cout << "Setting Jpeg comment '" << Params::instance().jpegComment_ - << "'" + << "'" << std::endl; } image_->setComment(Params::instance().jpegComment_); @@ -1477,7 +1477,7 @@ namespace { << path << "\n"; return 1; } - newPath = Util::dirname(path) + EXV_SEPERATOR_STR + newPath = Util::dirname(path) + EXV_SEPERATOR_STR + basename + Util::suffix(path); if ( Util::dirname(newPath) == Util::dirname(path) && Util::basename(newPath) == Util::basename(path)) { diff --git a/src/actions.hpp b/src/actions.hpp index 83b29a85..3a344ddd 100644 --- a/src/actions.hpp +++ b/src/actions.hpp @@ -58,7 +58,7 @@ namespace Exiv2 { namespace Action { //! Enumerates all tasks - enum TaskType { none, adjust, print, rename, erase, extract, insert, + enum TaskType { none, adjust, print, rename, erase, extract, insert, modify, fixiso }; // ***************************************************************************** diff --git a/src/crwimage.cpp b/src/crwimage.cpp index 7a89949c..80d2859e 100644 --- a/src/crwimage.cpp +++ b/src/crwimage.cpp @@ -326,7 +326,7 @@ namespace Exiv2 { CiffComponent::~CiffComponent() { - if (isAllocated_) delete[] pData_; + if (isAllocated_) delete[] pData_; } CiffDirectory::~CiffDirectory() @@ -347,7 +347,7 @@ namespace Exiv2 { { throw Error(34, "CiffEntry::add"); } // CiffEntry::doAdd - + void CiffDirectory::doAdd(AutoPtr component) { components_.push_back(component.release()); @@ -412,7 +412,7 @@ namespace Exiv2 { #ifdef DEBUG std::cout << " Entry for tag 0x" << std::hex << tagId() << " (0x" << tag() - << "), " << std::dec << size_ + << "), " << std::dec << size_ << " Bytes, Offset is " << offset_ << "\n"; #endif @@ -520,15 +520,15 @@ namespace Exiv2 { } } - uint32_t CiffComponent::write(Blob& blob, - ByteOrder byteOrder, + uint32_t CiffComponent::write(Blob& blob, + ByteOrder byteOrder, uint32_t offset) { return doWrite(blob, byteOrder, offset); } - uint32_t CiffEntry::doWrite(Blob& blob, - ByteOrder /*byteOrder*/, + uint32_t CiffEntry::doWrite(Blob& blob, + ByteOrder /*byteOrder*/, uint32_t offset) { return writeValueData(blob, offset); @@ -538,7 +538,7 @@ namespace Exiv2 { { if (dataLocation() == valueData) { #ifdef DEBUG - std::cout << " Data for tag 0x" << std::hex << tagId() + std::cout << " Data for tag 0x" << std::hex << tagId() << ", " << std::dec << size_ << " Bytes\n"; #endif offset_ = offset; @@ -553,8 +553,8 @@ namespace Exiv2 { return offset; } // CiffComponent::writeValueData - uint32_t CiffDirectory::doWrite(Blob& blob, - ByteOrder byteOrder, + uint32_t CiffDirectory::doWrite(Blob& blob, + ByteOrder byteOrder, uint32_t offset) { #ifdef DEBUG @@ -577,7 +577,7 @@ namespace Exiv2 { append(blob, buf, 2); dirOffset += 2; - // Directory entries + // Directory entries for (Components::iterator i = b; i != e; ++i) { (*i)->writeDirEntry(blob, byteOrder); dirOffset += 10; @@ -603,9 +603,9 @@ namespace Exiv2 { void CiffComponent::writeDirEntry(Blob& blob, ByteOrder byteOrder) const { #ifdef DEBUG - std::cout << " Directory entry for tag 0x" + std::cout << " Directory entry for tag 0x" << std::hex << tagId() << " (0x" << tag() - << "), " << std::dec << size_ + << "), " << std::dec << size_ << " Bytes, Offset is " << offset_ << "\n"; #endif byte buf[4]; @@ -742,13 +742,13 @@ namespace Exiv2 { return pRootDir_->findComponent(crwTagId, crwDir); } // CiffHeader::findComponent - CiffComponent* CiffComponent::findComponent(uint16_t crwTagId, + CiffComponent* CiffComponent::findComponent(uint16_t crwTagId, uint16_t crwDir) const { return doFindComponent(crwTagId, crwDir); } // CiffComponent::findComponent - CiffComponent* CiffComponent::doFindComponent(uint16_t crwTagId, + CiffComponent* CiffComponent::doFindComponent(uint16_t crwTagId, uint16_t crwDir) const { if (tagId() == crwTagId && dir() == crwDir) { @@ -757,8 +757,8 @@ namespace Exiv2 { return 0; } // CiffComponent::doFindComponent - CiffComponent* CiffDirectory::doFindComponent(uint16_t crwTagId, - uint16_t crwDir) const + CiffComponent* CiffDirectory::doFindComponent(uint16_t crwTagId, + uint16_t crwDir) const { CiffComponent* cc = 0; const Components::const_iterator b = components_.begin(); @@ -1144,7 +1144,7 @@ namespace Exiv2 { void CrwMap::encode(CiffHeader* pHead, const Image& image) { - for (const CrwMapping* cmi = crwMapping_; + for (const CrwMapping* cmi = crwMapping_; cmi->ifdId_ != ifdIdNotSet; ++cmi) { if (cmi->fromExif_ != 0) { cmi->fromExif_(image, cmi, pHead); @@ -1158,12 +1158,12 @@ namespace Exiv2 { { assert(pCrwMapping != 0); assert(pHead != 0); - + // Determine the source Exif metadatum ExifKey ek(pCrwMapping->tag_, ExifTags::ifdItem(pCrwMapping->ifdId_)); ExifData::const_iterator ed = image.exifData().findKey(ek); - // Set the new value or remove the entry + // Set the new value or remove the entry if (ed != image.exifData().end()) { DataBuf buf(ed->size()); ed->copy(buf.pData_, pHead->byteOrder()); @@ -1183,7 +1183,7 @@ namespace Exiv2 { std::string comment = image.comment(); - CiffComponent* cc = pHead->findComponent(pCrwMapping->crwTagId_, + CiffComponent* cc = pHead->findComponent(pCrwMapping->crwTagId_, pCrwMapping->crwDir_); if (!comment.empty()) { uint32_t size = static_cast(comment.size()); @@ -1236,14 +1236,14 @@ namespace Exiv2 { { assert(pCrwMapping != 0); assert(pHead != 0); - + IfdId ifdId = ifdIdNotSet; switch (pCrwMapping->tag_) { case 0x0001: ifdId = canonCs1IfdId; break; case 0x0004: ifdId = canonCs2IfdId; break; case 0x000f: ifdId = canonCfIfdId; break; } - assert(ifdId != ifdIdNotSet); + assert(ifdId != ifdIdNotSet); DataBuf buf = packIfdId(image.exifData(), ifdId, pHead->byteOrder()); if (buf.size_ == 0) { // Try the undecoded tag @@ -1301,7 +1301,7 @@ namespace Exiv2 { const ExifData::const_iterator edO = image.exifData().findKey(kO); const ExifData::const_iterator edEnd = image.exifData().end(); - CiffComponent* cc = pHead->findComponent(pCrwMapping->crwTagId_, + CiffComponent* cc = pHead->findComponent(pCrwMapping->crwTagId_, pCrwMapping->crwDir_); if (edX != edEnd || edY != edEnd || edO != edEnd) { uint32_t size = 28; @@ -1375,8 +1375,8 @@ namespace Exiv2 { return result; } - DataBuf packIfdId(const ExifData& exifData, - IfdId ifdId, + DataBuf packIfdId(const ExifData& exifData, + IfdId ifdId, ByteOrder byteOrder) { const uint16_t size = 1024; diff --git a/src/crwimage.hpp b/src/crwimage.hpp index d90e73c8..f8c816e8 100644 --- a/src/crwimage.hpp +++ b/src/crwimage.hpp @@ -204,9 +204,9 @@ namespace Exiv2 { This is the entry point to access image data in Ciff format. The parser uses classes CiffHeader, CiffEntry, CiffDirectory. - @param pCrwImage Pointer to the %Exiv2 Crw image to hold the metadata + @param pCrwImage Pointer to the %Exiv2 Crw image to hold the metadata read from the buffer. - @param pData Pointer to the data buffer. Must point to the data of + @param pData Pointer to the data buffer. Must point to the data of a Crw image; no checks are performed. @param size Length of the data buffer. @@ -214,11 +214,11 @@ namespace Exiv2 { */ static void decode(CrwImage* pCrwImage, const byte* pData, uint32_t size); /*! - @brief Encode metadata from the Crw image into a data buffer (the + @brief Encode metadata from the Crw image into a data buffer (the binary Crw image). - + @param blob Data buffer for the binary image (target). - @param pCrwImage Pointer to the %Exiv2 Crw image with the metadata to + @param pCrwImage Pointer to the %Exiv2 Crw image with the metadata to encode. @param pHead Parse tree containing the existing image. @@ -244,8 +244,8 @@ namespace Exiv2 { //! @name Creators //@{ //! Default constructor - CiffComponent() - : dir_(0), tag_(0), size_(0), offset_(0), pData_(0), + CiffComponent() + : dir_(0), tag_(0), size_(0), offset_(0), pData_(0), isAllocated_(false) {} //! Constructor taking a tag and directory CiffComponent(uint16_t tag, uint16_t dir) @@ -268,7 +268,7 @@ namespace Exiv2 { that don't exist yet are added along the way. Returns a pointer to the newly added component. - @param crwDirs Subdirectory path from root to the subdirectory + @param crwDirs Subdirectory path from root to the subdirectory containing the tag to be added. @param crwTagId Tag to be added. @@ -280,7 +280,7 @@ namespace Exiv2 { crwDirs contains the path of subdirectories, starting with the root directory, leading to \em crwTagId. - @param crwDirs Subdirectory path from root to the subdirectory + @param crwDirs Subdirectory path from root to the subdirectory containing the tag to be removed. @param crwTagId Tag to be removed. */ @@ -300,7 +300,7 @@ namespace Exiv2 { uint32_t start, ByteOrder byteOrder); /*! - @brief Write the metadata from the raw metadata component to the + @brief Write the metadata from the raw metadata component to the binary image \em blob. This method may append to the blob. @param blob Binary image to add metadata to @@ -314,7 +314,7 @@ namespace Exiv2 { @brief Writes the entry's value if size is larger than eight bytes. If needed, the value is padded with one 0 byte to make the number of bytes written to the blob even. The offset of the component - is set to the offset passed in. + is set to the offset passed in. @param blob The binary image to write to. @param offset Offset from the start of the directory for this entry. @@ -354,7 +354,7 @@ namespace Exiv2 { const std::string& prefix ="") const; /*! @brief Write a directory entry for the component to the \em blob. - If the size of the data is not larger than 8 bytes, the + If the size of the data is not larger than 8 bytes, the data is written to the directory entry. */ void writeDirEntry(Blob& blob, ByteOrder byteOrder) const; @@ -414,8 +414,8 @@ namespace Exiv2 { uint32_t start, ByteOrder byteOrder); //! Implements write() - virtual uint32_t doWrite(Blob& blob, - ByteOrder byteOrder, + virtual uint32_t doWrite(Blob& blob, + ByteOrder byteOrder, uint32_t offset) =0; //! Set the size of the data area. void setSize(uint32_t size) { size_ = size; } @@ -478,8 +478,8 @@ namespace Exiv2 { @brief Implements write(). Writes only the value data of the entry, using writeValueData(). */ - virtual uint32_t doWrite(Blob& blob, - ByteOrder byteOrder, + virtual uint32_t doWrite(Blob& blob, + ByteOrder byteOrder, uint32_t offset); //@} @@ -534,8 +534,8 @@ namespace Exiv2 { @brief Implements write(). Writes the complete Ciff directory to the blob. */ - virtual uint32_t doWrite(Blob& blob, - ByteOrder byteOrder, + virtual uint32_t doWrite(Blob& blob, + ByteOrder byteOrder, uint32_t offset); // See base class comment virtual void doRead(const byte* pData, @@ -559,7 +559,7 @@ namespace Exiv2 { virtual bool doEmpty() const; // See base class comment - virtual CiffComponent* doFindComponent(uint16_t crwTagId, + virtual CiffComponent* doFindComponent(uint16_t crwTagId, uint16_t crwDir) const; //@} @@ -618,7 +618,7 @@ namespace Exiv2 { void add(uint16_t crwTagId, uint16_t crwDir, DataBuf buf); /*! @brief Remove entry \em crwTagId in directory \em crwDir from the parse - tree. If it's the last entry in the directory, the directory is + tree. If it's the last entry in the directory, the directory is removed as well, etc. @param crwTagId Tag id to be removed. @@ -633,7 +633,7 @@ namespace Exiv2 { //! @name Accessors //@{ /*! - @brief Write the Crw image to the binary image \em blob, starting with + @brief Write the Crw image to the binary image \em blob, starting with the Ciff header. This method appends to the blob. @param blob Binary image to add to. @@ -660,7 +660,7 @@ namespace Exiv2 { //! Return the byte order (little or big endian). ByteOrder byteOrder() const { return byteOrder_; } /*! - @brief Finds \em crwTagId in directory \em crwDir in the parse tree, + @brief Finds \em crwTagId in directory \em crwDir in the parse tree, returning a pointer to the component or 0 if not found. */ CiffComponent* findComponent(uint16_t crwTagId, uint16_t crwDir) const; @@ -684,7 +684,7 @@ namespace Exiv2 { uint16_t parent_; //!< Parent directory tag }; // struct CrwSubDir - /*! + /*! @brief Structure for a mapping table for conversion of CIFF entries to image metadata and vice versa. */ @@ -735,7 +735,7 @@ namespace Exiv2 { public: /*! @brief Decode image metadata from a Crw entry convert and add it - to the image metadata. This function converts only one Crw + to the image metadata. This function converts only one Crw component. @param ciffComponent Source CIFF entry @@ -819,8 +819,8 @@ namespace Exiv2 { Image& image, ByteOrder byteOrder); - /*! - @brief Standard encode function to convert Exif metadata to Crw + /*! + @brief Standard encode function to convert Exif metadata to Crw entries. This is the basic encode function taking one Exif key and converting @@ -828,9 +828,9 @@ namespace Exiv2 { in. @param image Image with the metadata to encode - @param pCrwMapping Pointer to an entry into the \em crwMapping_ table + @param pCrwMapping Pointer to an entry into the \em crwMapping_ table with information on the source and target metadata entries. - @param pHead Pointer to the head of the CIFF parse tree into which + @param pHead Pointer to the head of the CIFF parse tree into which the metadata from \em image is encoded. */ static void encodeBasic(const Image& image, @@ -869,7 +869,7 @@ namespace Exiv2 { private: // DATA static const CrwMapping crwMapping_[]; //!< Metadata conversion table - static const CrwSubDir crwSubDir_[]; //!< Ciff directory hierarchy + static const CrwSubDir crwSubDir_[]; //!< Ciff directory hierarchy }; // class CrwMap @@ -893,8 +893,8 @@ namespace Exiv2 { data buffer. This function is used to pack Canon Camera Settings1,2 and Custom Function tags. */ - DataBuf packIfdId(const ExifData& exifData, - IfdId ifdId, + DataBuf packIfdId(const ExifData& exifData, + IfdId ifdId, ByteOrder byteOrder); } // namespace Exiv2 diff --git a/src/crwparse.cpp b/src/crwparse.cpp index c191e442..b741a614 100644 --- a/src/crwparse.cpp +++ b/src/crwparse.cpp @@ -14,7 +14,7 @@ try { std::cout << "Print the CIFF structure of a CRW file\n"; return 1; } - + Exiv2::FileIo io(argv[1]); if(io.open() != 0) { throw Exiv2::Error(9, io.path(), Exiv2::strError()); diff --git a/src/doxygen.hpp b/src/doxygen.hpp index 8d03742d..88ae58e9 100644 --- a/src/doxygen.hpp +++ b/src/doxygen.hpp @@ -106,7 +106,7 @@ bug tracking system.

details.

You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., + with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /*! diff --git a/src/exif.cpp b/src/exif.cpp index 4ae03f40..808f4d3c 100644 --- a/src/exif.cpp +++ b/src/exif.cpp @@ -185,7 +185,7 @@ namespace Exiv2 { void Exifdatum::setValue(const Entry& e, ByteOrder byteOrder) { TypeId t = TypeId(e.type()); - // Hack: On the fly type conversion for Exif.Photo.UserComment + // Hack: On the fly type conversion for Exif.Photo.UserComment if (e.tag() == 0x9286 && e.ifdId() == exifIfdId && e.type() == undefined) { t = comment; } diff --git a/src/exif.hpp b/src/exif.hpp index e9fccaf6..2386b053 100644 --- a/src/exif.hpp +++ b/src/exif.hpp @@ -867,7 +867,7 @@ namespace Exiv2 { return exifDatum; } /*! - @brief Returns the IfdId of the first Exif makernote tag it finds in the + @brief Returns the IfdId of the first Exif makernote tag it finds in the Exif metadata or ifdIdNotSet if there is no Exif makernote tag. */ IfdId hasMakerNote(const ExifData& exifData); diff --git a/src/exiv2.cpp b/src/exiv2.cpp index b8c6108c..ac0626b0 100644 --- a/src/exiv2.cpp +++ b/src/exiv2.cpp @@ -475,7 +475,7 @@ int Params::evalModify(int opt, const std::string& optarg) action_ = Action::modify; // fallthrough case Action::modify: - if (opt == 'c') jpegComment_ = optarg; + if (opt == 'c') jpegComment_ = optarg; if (opt == 'm') cmdFiles_.push_back(optarg); // parse the files later if (opt == 'M') cmdLines_.push_back(optarg); // parse the commands later break; @@ -594,7 +594,7 @@ int Params::getopt(int argc, char* const argv[]) << ": Adjust action requires option -a time\n"; rc = 1; } - if ( action_ == Action::modify + if ( action_ == Action::modify && cmdFiles_.empty() && cmdLines_.empty() && jpegComment_.empty()) { std::cerr << progname() << ": Modify action requires at least one -c, -m or -M option\n"; diff --git a/src/exiv2.hpp b/src/exiv2.hpp index d7b176c7..f3bddf19 100644 --- a/src/exiv2.hpp +++ b/src/exiv2.hpp @@ -135,8 +135,8 @@ public: bool verbose_; //!< Verbose (talkative) option flag. bool force_; //!< Force overwrites flag. bool preserve_; //!< Preserve timestamps flag. - bool timestamp_; //!< Rename also sets the file timestamp. - bool timestampOnly_; //!< Rename only sets the file timestamp. + bool timestamp_; //!< Rename also sets the file timestamp. + bool timestampOnly_; //!< Rename only sets the file timestamp. FileExistsPolicy fileExistsPolicy_; //!< What to do if file to rename exists. bool adjust_; //!< Adjustment flag. PrintMode printMode_; //!< Print mode. diff --git a/src/ifd.cpp b/src/ifd.cpp index 7531d5db..39458081 100644 --- a/src/ifd.cpp +++ b/src/ifd.cpp @@ -433,11 +433,11 @@ namespace Exiv2 { // Set the size to at least for bytes to accomodate offset-data #ifndef SUPPRESS_WARNINGS if (i->type_ < 1 || i->type_ > 10 || i->type_ == 6) { - std::cerr << "Warning: " - << ExifTags::ifdName(ifdId_) << " tag 0x" + std::cerr << "Warning: " + << ExifTags::ifdName(ifdId_) << " tag 0x" << std::setw(4) << std::setfill('0') << std::hex << i->tag_ << " has invalid Exif type " - << std::dec << i->type_ + << std::dec << i->type_ << "; using 7 (undefined).\n"; } #endif diff --git a/src/image.hpp b/src/image.hpp index 171f2e3e..509b64d2 100644 --- a/src/image.hpp +++ b/src/image.hpp @@ -246,7 +246,7 @@ namespace Exiv2 { //! @name Creators //@{ //! Constructor taking a bitmap of the metadata types, which are supported - Image(uint16_t supportedMetadata) + Image(uint16_t supportedMetadata) : supportedMetadata_(supportedMetadata) {} //@} diff --git a/src/types.hpp b/src/types.hpp index d7ae0e43..855c5e4e 100644 --- a/src/types.hpp +++ b/src/types.hpp @@ -292,7 +292,7 @@ namespace Exiv2 { /*! @brief Converts a string in the form "%Y:%m:%d %H:%M:%S", e.g., - "2007:05:24 12:31:55" to broken down time format, + "2007:05:24 12:31:55" to broken down time format, returns 0 if successful, else 1. */ int exifTime(const char* buf, struct tm* tm); diff --git a/src/value.hpp b/src/value.hpp index 2bffab2f..8ad99af3 100644 --- a/src/value.hpp +++ b/src/value.hpp @@ -808,7 +808,7 @@ namespace Exiv2 { //! @name Manipulators //@{ /*! - @brief Set time from \em buf if it conforms to \em format + @brief Set time from \em buf if it conforms to \em format (3 input items). This function only sets the hour, minute and second parts of time_. @@ -819,7 +819,7 @@ namespace Exiv2 { */ int scanTime3(const char* buf, const char* format); /*! - @brief Set time from \em buf if it conforms to \em format + @brief Set time from \em buf if it conforms to \em format (6 input items). This function sets all parts of time_.