third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tweaks.

Browse Source
This commit is contained in:
Andreas Huggel 2010-09-25 15:48:29 +00:00
parent d49caba41e
commit 8b66d3e7db
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/tags.cpp
View File

@ -2801,7 +2801,8 @@ namespace Exiv2 {
key_ = std::string(familyName_) + "." + groupName_ + "." + tagName();
}
void ExifKey::create_internal(uint16_t tag, const std::string& groupName)
ExifKey::ExifKey(uint16_t tag, const std::string& groupName)
: p_(new Impl)
{
IfdId ifdId = groupId(groupName);
// Todo: Test if this condition can be removed
@ -2816,16 +2817,15 @@ namespace Exiv2 {
p_->makeKey(tag, ifdId, ti);
}
ExifKey::ExifKey(uint16_t tag, const std::string& groupName)
: p_(new Impl)
{
create_internal(tag, groupName);
}
ExifKey::ExifKey(const TagInfo& ti)
: p_(new Impl)
{
create_internal(ti.tag_, Internal::groupName(static_cast<Internal::IfdId>(ti.ifdId_)));
IfdId ifdId = static_cast<IfdId>(ti.ifdId_);
if (!Internal::isExifIfd(ifdId) && !Internal::isMakerIfd(ifdId)) {
throw Error(23, ifdId);
}
p_->groupName_ = Exiv2::groupName(ifdId);
p_->makeKey(ti.tag_, ifdId, &ti);
}
ExifKey::ExifKey(const std::string& key)
@ -2925,8 +2925,7 @@ namespace Exiv2 {
std::ostream& operator<<(std::ostream& os, const TagInfo& ti)
{
ExifKey exifKey(ti.tag_, Internal::groupName(static_cast<Internal::IfdId>(ti.ifdId_)));
ExifKey exifKey(ti);
return os << exifKey.tagName() << ",\t"
<< std::dec << exifKey.tag() << ",\t"
<< "0x" << std::setw(4) << std::setfill('0')

2
src/tags.hpp
View File

@ -219,8 +219,6 @@ namespace Exiv2 {
private:
//! Internal virtual copy constructor.
EXV_DLLLOCAL virtual ExifKey* clone_() const;
//! Internal construction method.
void create_internal(uint16_t tag, const std::string& groupName);
private:
// Pimpl idiom