|
Lines 497-515
set_attributes_from_tagsets (GFileInfo *info)
Link Here
|
| 497 |
static const char * |
497 |
static const char * |
| 498 |
get_exif_default_category (const Exiv2::Exifdatum &md) |
498 |
get_exif_default_category (const Exiv2::Exifdatum &md) |
| 499 |
{ |
499 |
{ |
|
|
500 |
#if EXIV2_TEST_VERSION(0, 21, 0) |
| 501 |
if (Exiv2::ExifTags::isMakerGroup(md.groupName())) |
| 502 |
#else |
| 500 |
if (Exiv2::ExifTags::isMakerIfd(md.ifdId())) |
503 |
if (Exiv2::ExifTags::isMakerIfd(md.ifdId())) |
|
|
504 |
#endif |
| 501 |
return "Exif::MakerNotes"; |
505 |
return "Exif::MakerNotes"; |
| 502 |
|
506 |
|
| 503 |
switch (md.ifdId()) { |
507 |
if (md.groupName().compare("Thumbnail") == 0) |
| 504 |
case Exiv2::ifd1Id: |
|
|
| 505 |
return "Exif::Thumbnail"; |
508 |
return "Exif::Thumbnail"; |
| 506 |
case Exiv2::gpsIfdId: |
509 |
else if (md.groupName().compare("GPSInfo") == 0) |
| 507 |
return "Exif::GPS"; |
510 |
return "Exif::GPS"; |
| 508 |
case Exiv2::iopIfdId: |
511 |
else if (md.groupName().compare("Iop") == 0) |
| 509 |
return "Exif::Versions"; |
512 |
return "Exif::Versions"; |
| 510 |
default: |
|
|
| 511 |
break; |
| 512 |
} |
| 513 |
|
513 |
|
| 514 |
return "Exif::Other"; |
514 |
return "Exif::Other"; |
| 515 |
} |
515 |
} |
|
Lines 531-537
exiv2_read_metadata (Exiv2::Image::AutoPtr image,
Link Here
|
| 531 |
stringstream description; |
531 |
stringstream description; |
| 532 |
if (! md->tagLabel().empty()) |
532 |
if (! md->tagLabel().empty()) |
| 533 |
description << md->tagLabel(); |
533 |
description << md->tagLabel(); |
| 534 |
else if (md->ifdId () > Exiv2::ifd1Id) |
534 |
#if EXIV2_TEST_VERSION(0, 21, 0) |
|
|
535 |
else if (Exiv2::ExifTags::isMakerGroup(md->groupName())) |
| 536 |
#else |
| 537 |
else if (Exiv2::ExifTags::isMakerIfd(md->ifdId())) |
| 538 |
#endif |
| 535 |
// Must be a MakerNote - include group name |
539 |
// Must be a MakerNote - include group name |
| 536 |
description << md->groupName() << "." << md->tagName(); |
540 |
description << md->groupName() << "." << md->tagName(); |
| 537 |
else |
541 |
else |
| 538 |
- |
|
|
