Fixed MinGW/older g++ compilation problem

v0.27.3
Andreas Huggel 19 years ago
parent d85701137e
commit 345cc8fa43

@ -58,7 +58,7 @@ namespace Exiv2 {
{ "*", Tag::all, Group::ignr, 0 }, // Do not decode tags with group == Group::ignr { "*", Tag::all, Group::ignr, 0 }, // Do not decode tags with group == Group::ignr
{ "OLYMPUS", 0x0100, Group::olympmn, &TiffMetadataDecoder::decodeOlympThumb }, { "OLYMPUS", 0x0100, Group::olympmn, &TiffMetadataDecoder::decodeOlympThumb },
{ "NIKON", Tag::all, Group::sub0_0, 0 }, { "NIKON", Tag::all, Group::sub0_0, 0 },
{ "NIKON", Tag::all, Group::sub0_1, &TiffMetadataDecoder::decodeTo<Group::ifd0> } { "NIKON", Tag::all, Group::sub0_1, &TiffMetadataDecoder::decodeToGroup<Group::ifd0> }
}; };
bool TiffDecoderInfo::operator==(const TiffDecoderInfo::Key& key) const bool TiffDecoderInfo::operator==(const TiffDecoderInfo::Key& key) const

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

Loading…
Cancel
Save