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

#526: Added support for preview image in a sub-IFD of the Nikon3 makernote.

Browse Source
This commit is contained in:
Andreas Huggel 2008-08-03 02:02:30 +00:00
parent ff875f5759
commit cd5508f16c
5 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/makernote2_int.hpp
View File

@ -67,6 +67,7 @@ namespace Exiv2 {
const uint16_t canonpi = 277; //!< Canon picture info
const uint16_t canonpa = 278; //!< Canon panorama
const uint16_t pentaxmn = 279; //!< Pentax makernote
const uint16_t nikon3pv = 280; //!< Nikon3 preview sub-IFD
}
// *****************************************************************************

1
src/tags.cpp
View File

@ -101,6 +101,7 @@ namespace Exiv2 {
{ nikon1IfdId, "Makernote", "Nikon1", Nikon1MakerNote::tagList },
{ nikon2IfdId, "Makernote", "Nikon2", Nikon2MakerNote::tagList },
{ nikon3IfdId, "Makernote", "Nikon3", Nikon3MakerNote::tagList },
{ nikon3PvIfdId, "Makernote", "Nikon3Preview",ExifTags::ifdTagList },
{ olympusIfdId, "Makernote", "Olympus", OlympusMakerNote::tagList },
{ panasonicIfdId, "Makernote", "Panasonic", PanasonicMakerNote::tagList },
{ pentaxIfdId, "Makernote", "Pentax", PentaxMakerNote::tagList },

3
src/tiffcomposite.cpp
View File

@ -98,7 +98,8 @@ namespace Exiv2 {
{ 276, "MinoltaCs7D" },
{ 277, "CanonPi" },
{ 278, "CanonPa" },
{ 279, "Pentax" }
{ 279, "Pentax" },
{ 280, "Nikon3Preview"}
};
bool TiffGroupInfo::operator==(const uint16_t& group) const

7
src/tiffimage.cpp
View File

@ -368,8 +368,15 @@ namespace Exiv2 {
// Nikon3 makernote
{ Tag::next, Group::nikon3mn, Group::ignr, 0x927c, Group::exif, newTiffDirectory },
{ 0x0011, Group::nikon3mn, Group::nikon3pv, 0x927c, Group::exif, newTiffSubIfd },
{ Tag::all, Group::nikon3mn, Group::nikon3mn, 0x927c, Group::exif, newTiffEntry },
// Nikon3 makernote preview sub-IFD
{ 0x0201, Group::nikon3pv, Group::nikon3pv, 0x0011, Group::nikon3mn, newTiffThumbData<0x0202, Group::nikon3pv> },
{ 0x0202, Group::nikon3pv, Group::nikon3pv, 0x0011, Group::nikon3mn, newTiffThumbSize<0x0201, Group::nikon3pv> },
{ Tag::next, Group::nikon3pv, Group::ignr, 0x0011, Group::nikon3mn, newTiffDirectory },
{ Tag::all, Group::nikon3pv, Group::nikon3pv, 0x0011, Group::nikon3mn, newTiffEntry },
// Panasonic makernote
{ Tag::next, Group::panamn, Group::ignr, 0x927c, Group::exif, newTiffDirectory },
{ Tag::all, Group::panamn, Group::panamn, 0x927c, Group::exif, newTiffEntry },

2
src/types.hpp
View File

@ -141,7 +141,7 @@ namespace Exiv2 {
fujiIfdId,
minoltaIfdId, minoltaCs5DIfdId, minoltaCs7DIfdId,
minoltaCsOldIfdId, minoltaCsNewIfdId,
nikon1IfdId, nikon2IfdId, nikon3IfdId,
nikon1IfdId, nikon2IfdId, nikon3IfdId, nikon3PvIfdId,
olympusIfdId, panasonicIfdId, pentaxIfdId, sigmaIfdId, sonyIfdId,
lastIfdId };