Added XMP lists to taglist program, fixed printProperties().

v0.27.3
Andreas Huggel 18 years ago
parent f51e7e0512
commit 24e9e36713

@ -896,9 +896,8 @@ namespace Exiv2 {
{ {
const XmpPropertyInfo* pl = propertyList(prefix); const XmpPropertyInfo* pl = propertyList(prefix);
if (pl) { if (pl) {
const int ck = sizeof(pl) / sizeof(pl[0]); for (int i = 0; pl[i].name_ != 0; ++i) {
for (int k = 0; k < ck; ++k) { os << pl[i];
os << pl[k];
} }
} }

@ -11,6 +11,7 @@
#include "makernote.hpp" #include "makernote.hpp"
#include "tags.hpp" #include "tags.hpp"
#include "datasets.hpp" #include "datasets.hpp"
#include "properties.hpp"
#include "error.hpp" #include "error.hpp"
#include <string> #include <string>
@ -40,10 +41,16 @@ try {
IfdId ifdId = ExifTags::ifdIdByIfdItem(item); IfdId ifdId = ExifTags::ifdIdByIfdItem(item);
if (ExifTags::isMakerIfd(ifdId)) { if (ExifTags::isMakerIfd(ifdId)) {
ExifTags::makerTaglist(std::cout, ifdId); ExifTags::makerTaglist(std::cout, ifdId);
break;
}
try {
XmpProperties::printProperties(std::cout, item);
} }
else { catch(const AnyError& e) {
rc = 2; rc = 2;
} }
break; break;
} }
case 1: case 1:
@ -55,7 +62,8 @@ try {
} }
if (rc) { if (rc) {
std::cout << "Usage: " << argv[0] std::cout << "Usage: " << argv[0]
<< " [Exif|Canon|CanonCs|CanonSi|CanonCf|Fujifilm|Minolta|Nikon1|Nikon2|Nikon3|Olympus|Panasonic|Pentax|Sigma|Sony|Iptc]\n" << " [Exif|Canon|CanonCs|CanonSi|CanonCf|Fujifilm|Minolta|Nikon1|Nikon2|Nikon3|Olympus|Panasonic|Pentax|Sigma|Sony|Iptc"
<< "|dc|xmp|xmpRights|xmpMM|xmpBJ|xmpTPg|xmpDM|pdf|photoshop|crs|tiff|exif|aux|iptc]\n"
<< "Print Exif tags, MakerNote tags, or Iptc datasets\n"; << "Print Exif tags, MakerNote tags, or Iptc datasets\n";
} }
return rc; return rc;

Loading…
Cancel
Save