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

Fixed MinGW/older g++ compilation problem

Browse Source
This commit is contained in:
Andreas Huggel 2006-05-20 03:12:12 +00:00
parent d85701137e
commit 345cc8fa43
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tiffvisitor.cpp
View File

@ -56,9 +56,9 @@ namespace Exiv2 {
// TIFF Decoder table for special decoding requirements
const TiffDecoderInfo TiffMetadataDecoder::tiffDecoderInfo_[] = {
{ "*", Tag::all, Group::ignr, 0 }, // Do not decode tags with group == Group::ignr
{ "OLYMPUS", 0x0100, Group::olympmn, &TiffMetadataDecoder::decodeOlympThumb },
{ "NIKON", Tag::all, Group::sub0_0, 0 },
{ "NIKON", Tag::all, Group::sub0_1, &TiffMetadataDecoder::decodeTo<Group::ifd0> }
{ "OLYMPUS", 0x0100, Group::olympmn, &TiffMetadataDecoder::decodeOlympThumb },
{ "NIKON", Tag::all, Group::sub0_0, 0 },
{ "NIKON", Tag::all, Group::sub0_1, &TiffMetadataDecoder::decodeToGroup<Group::ifd0> }
};
bool TiffDecoderInfo::operator==(const TiffDecoderInfo::Key& key) const

8
src/tiffvisitor.hpp
View File

@ -281,10 +281,10 @@ namespace Exiv2 {
void decodeOlympThumb(const TiffEntryBase* object);
//! Decode object to the Exif entry tag, group given as template parameters
template<uint16_t tag, uint16_t group>
void decodeTo(const TiffEntryBase* object);
void decodeToTag(const TiffEntryBase* object);
//! Decode object to the Exif entry with group according to the template parameter
template<uint16_t group>
void decodeTo(const TiffEntryBase* object);
void decodeToGroup(const TiffEntryBase* object);
//@}
private:
@ -506,7 +506,7 @@ namespace Exiv2 {
// template, inline and free functions
template<uint16_t tag, uint16_t group>
void TiffMetadataDecoder::decodeTo(const TiffEntryBase* object)
void TiffMetadataDecoder::decodeToTag(const TiffEntryBase* object)
{
assert(object);
// Todo: ExifKey should have an appropriate c'tor, it should not be
@ -516,7 +516,7 @@ namespace Exiv2 {
}
template<uint16_t group>
void TiffMetadataDecoder::decodeTo(const TiffEntryBase* object)
void TiffMetadataDecoder::decodeToGroup(const TiffEntryBase* object)
{
assert(object);
// Todo: ExifKey should have an appropriate c'tor, it should not be