xymp
/
exiv2
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved output data and format of the utility and examples, updated test results

Browse Source
v0.27.3
Andreas Huggel 20 years ago
parent 17f2c4bd58
commit 30f110c643
23 changed files with 2713 additions and 950 deletions
Show Stats Download Patch File Download Diff File

26
src/actions.cpp
Unescape Escape View File

@ -454,13 +454,15 @@ namespace Action {
} }
Exiv2::ExifData::const_iterator md; Exiv2::ExifData::const_iterator md;
for (md = exifData.begin(); md != exifData.end(); ++md) { for (md = exifData.begin(); md != exifData.end(); ++md) {
std::cout << "0x" << std::setw(4) << std::setfill('0') << std::right std::cout << std::setw(44) << std::setfill(' ') << std::left
<< std::hex << md->tag() << " " << md->key() << " "
<< std::setw(9) << std::setfill(' ') << std::left << std::setw(9) << std::setfill(' ') << std::left
<< md->ifdName() << " " << md->typeName() << " "
<< std::setw(27) << std::setfill(' ') << std::left << std::dec << std::setw(3)
<< md->tagName() << " " << std::setfill(' ') << std::right
<< std::dec << *md << std::endl; << md->count() << " "
<< std::dec << *md
<< std::endl;
} }
return 0; return 0;
@ -489,13 +491,13 @@ namespace Action {
<< std::hex << md->tag() << " " << std::hex << md->tag() << " "
<< std::setw(9) << std::setfill(' ') << std::left << std::setw(9) << std::setfill(' ') << std::left
<< md->ifdName() << " " << md->ifdName() << " "
<< std::setw(27) << std::setfill(' ') << std::left
<< md->tagName() << " "
<< std::setw(9) << std::setfill(' ') << std::left << std::setw(9) << std::setfill(' ') << std::left
<< md->typeName() << " " << md->typeName() << " "
<< std::dec << std::setw(3) << std::dec << std::setw(3)
<< std::setfill(' ') << std::right << std::setfill(' ') << std::right
<< md->count() << " " << md->count() << " "
<< std::setw(27) << std::setfill(' ') << std::left
<< md->tagName() << " "
<< std::dec << md->value() << std::dec << md->value()
<< std::endl; << std::endl;
} }
@ -522,17 +524,13 @@ namespace Action {
Exiv2::IptcData::const_iterator end = iptcData.end(); Exiv2::IptcData::const_iterator end = iptcData.end();
Exiv2::IptcData::const_iterator md; Exiv2::IptcData::const_iterator md;
for (md = iptcData.begin(); md != end; ++md) { for (md = iptcData.begin(); md != end; ++md) {
std::cout << "0x" << std::setw(4) << std::setfill('0') << std::right std::cout << std::setw(44) << std::setfill(' ') << std::left
<< std::hex << md->tag() << " " << md->key() << " "
<< std::setw(12) << std::setfill(' ') << std::left
<< md->recordName() << " "
<< std::setw(9) << std::setfill(' ') << std::left << std::setw(9) << std::setfill(' ') << std::left
<< md->typeName() << " " << md->typeName() << " "
<< std::dec << std::setw(3) << std::dec << std::setw(3)
<< std::setfill(' ') << std::right << std::setfill(' ') << std::right
<< md->count() << " " << md->count() << " "
<< std::setw(27) << std::setfill(' ') << std::left
<< md->tagName() << " "
<< std::dec << md->value() << std::dec << md->value()
<< std::endl; << std::endl;
} }

7
src/exifprint.cpp
Unescape Escape View File

@ -28,10 +28,15 @@ try {
} }
Exiv2::ExifData::const_iterator end = exifData.end(); Exiv2::ExifData::const_iterator end = exifData.end();
for (Exiv2::ExifData::const_iterator i = exifData.begin(); i != end; ++i) { for (Exiv2::ExifData::const_iterator i = exifData.begin(); i != end; ++i) {
std::cout << std::setw(53) << std::setfill(' ') << std::left std::cout << std::setw(44) << std::setfill(' ') << std::left
<< i->key() << " " << i->key() << " "
<< "0x" << std::setw(4) << std::setfill('0') << std::right << "0x" << std::setw(4) << std::setfill('0') << std::right
<< std::hex << i->tag() << " " << std::hex << i->tag() << " "
<< std::setw(9) << std::setfill(' ') << std::left
<< i->typeName() << " "
<< std::dec << std::setw(3)
<< std::setfill(' ') << std::right
<< i->count() << " "
<< std::dec << i->value() << std::dec << i->value()
<< "\n"; << "\n";
} }

2
src/iptcprint.cpp
Unescape Escape View File

@ -29,7 +29,7 @@ try {
Exiv2::IptcData::iterator end = iptcData.end(); Exiv2::IptcData::iterator end = iptcData.end();
for (Exiv2::IptcData::iterator md = iptcData.begin(); md != end; ++md) { for (Exiv2::IptcData::iterator md = iptcData.begin(); md != end; ++md) {
std::cout << std::setw(36) << std::setfill(' ') << std::left std::cout << std::setw(44) << std::setfill(' ') << std::left
<< md->key() << " " << md->key() << " "
<< "0x" << std::setw(4) << std::setfill('0') << std::right << "0x" << std::setw(4) << std::setfill('0') << std::right
<< std::hex << md->tag() << " " << std::hex << md->tag() << " "

2
src/types.cpp
Unescape Escape View File

@ -287,7 +287,7 @@ namespace Exiv2 {
std::ostringstream ss; std::ostringstream ss;
do { do {
byte c = buf[i]; byte c = buf[i];
os << std::setw(2) << std::setfill('0') os << std::setw(2) << std::setfill('0') << std::right
<< std::hex << (int)c << " "; << std::hex << (int)c << " ";
ss << ((int)c >= 31 && (int)c < 127 ? char(buf[i]) : '.'); ss << ((int)c >= 31 && (int)c < 127 ? char(buf[i]) : '.');
} while (++i < len && i%16 != 0); } while (++i < len && i%16 != 0);

12
test/data/addmoddel.out
Unescape Escape View File

@ -4,9 +4,9 @@ Added key "Exif.Image.PrimaryChromaticities", value "1/2 1/3 2/3 3/4"
Modified key "Exif.Image.PrimaryChromaticities", new value "2000:12:31 23:59:59" Modified key "Exif.Image.PrimaryChromaticities", new value "2000:12:31 23:59:59"
Modified key "Exif.Image.PrimaryChromaticities", new value "1/2 1/3 88/77 3/4" Modified key "Exif.Image.PrimaryChromaticities", new value "1/2 1/3 88/77 3/4"
Deleted key "Exif.Image.PrimaryChromaticities" Deleted key "Exif.Image.PrimaryChromaticities"
0x0110 IFD0 Ascii 7 Model Test 1 0x0110 IFD0 Model Ascii 7 Test 1
0x0115 IFD0 Short 1 SamplesPerPixel 162 0x0115 IFD0 SamplesPerPixel Short 1 162
0x011a IFD0 SLong 1 XResolution -2 0x011a IFD0 XResolution SLong 1 -2
0x011b IFD0 SRational 1 YResolution -2/3 0x011b IFD0 YResolution SRational 1 -2/3
0x8769 IFD0 Long 1 ExifTag 89 0x8769 IFD0 ExifTag Long 1 89
0x9003 Exif Ascii 20 DateTimeOriginal 2000:12:31 23:59:59 0x9003 Exif DateTimeOriginal Ascii 20 2000:12:31 23:59:59

1324
test/data/exiv2-test.out
View File

File diff suppressed because it is too large Load Diff

94
test/data/modify-test.out
Unescape Escape View File

@ -11,52 +11,52 @@ Set Exif.Photo.UserComment "charset=Ascii This is an ASCII Exif comment" (Commen
File 1/1: exiv2-gc.jpg File 1/1: exiv2-gc.jpg
Set Exif.Image.Software "Exiv2 utility!!" (Ascii) Set Exif.Image.Software "Exiv2 utility!!" (Ascii)
File 1/1: exiv2-empty.jpg File 1/1: exiv2-empty.jpg
0x006e Application2 String 12 Credit mee too! (1) Iptc.Application2.Credit String 12 mee too! (1)
0x0069 Application2 String 8 Headline Headline Iptc.Application2.Headline String 8 Headline
File 1/2: exiv2-empty.jpg File 1/2: exiv2-empty.jpg
0x0132 IFD0 DateTime Zwanzig nach fuenf Exif.Image.DateTime Ascii 19 Zwanzig nach fuenf
0x013b IFD0 Artist Vincent van Gogh Exif.Image.Artist Ascii 17 Vincent van Gogh
0x013e IFD0 WhitePoint 32 12 4 5 6 Exif.Image.WhitePoint Short 5 32 12 4 5 6
0x8769 IFD0 ExifTag 108 Exif.Image.ExifTag Long 1 108
0x9286 Exif UserComment This is an ASCII Exif comment Exif.Photo.UserComment Undefined 37 This is an ASCII Exif comment
File 2/2: exiv2-gc.jpg File 2/2: exiv2-gc.jpg
0x010e IFD0 ImageDescription Exif JPEG Exif.Image.ImageDescription Ascii 18 Exif JPEG
0x010f IFD0 Make Camera Exif.Image.Make Ascii 8 Camera
0x0110 IFD0 Model DC-4300 Exif.Image.Model Ascii 16 DC-4300
0x0112 IFD0 Orientation top, left Exif.Image.Orientation Short 1 top, left
0x011a IFD0 XResolution 72 Exif.Image.XResolution Rational 1 72
0x011b IFD0 YResolution 72 Exif.Image.YResolution Rational 1 72
0x0128 IFD0 ResolutionUnit inch Exif.Image.ResolutionUnit Short 1 inch
0x0131 IFD0 Software Exiv2 utility!! Exif.Image.Software Ascii 22 Exiv2 utility!!
0x0132 IFD0 DateTime 2004:06:08 16:04:50 Exif.Image.DateTime Ascii 20 2004:06:08 16:04:50
0x0213 IFD0 YCbCrPositioning Co-sited Exif.Image.YCbCrPositioning Short 1 Co-sited
0x8769 IFD0 ExifTag 6480 Exif.Image.ExifTag Long 1 6480
0x829a Exif ExposureTime 1/95 s Exif.Photo.ExposureTime Rational 1 1/95 s
0x829d Exif FNumber F9.1 Exif.Photo.FNumber Rational 1 F9.1
0x8822 Exif ExposureProgram Landscape mode Exif.Photo.ExposureProgram Short 1 Landscape mode
0x8827 Exif ISOSpeedRatings 100 Exif.Photo.ISOSpeedRatings Short 1 100
0x9000 Exif ExifVersion 48 50 49 48 Exif.Photo.ExifVersion Undefined 4 48 50 49 48
0x9003 Exif DateTimeOriginal 2004:06:08 16:04:50 Exif.Photo.DateTimeOriginal Ascii 20 2004:06:08 16:04:50
0x9004 Exif DateTimeDigitized 2004:06:08 16:04:50 Exif.Photo.DateTimeDigitized Ascii 20 2004:06:08 16:04:50
0x9101 Exif ComponentsConfiguration YCbCr Exif.Photo.ComponentsConfiguration Undefined 4 YCbCr
0x9201 Exif ShutterSpeedValue 6.6 Exif.Photo.ShutterSpeedValue SRational 1 6.6
0x9202 Exif ApertureValue 6.4 Exif.Photo.ApertureValue Rational 1 6.4
0x9204 Exif ExposureBiasValue 0 Exif.Photo.ExposureBiasValue SRational 1 0
0x9205 Exif MaxApertureValue 3.1 Exif.Photo.MaxApertureValue Rational 1 3.1
0x9207 Exif MeteringMode Matrix Exif.Photo.MeteringMode Short 1 Matrix
0x9208 Exif LightSource Unknown Exif.Photo.LightSource Short 1 Unknown
0x9209 Exif Flash No Exif.Photo.Flash Short 1 No
0xa000 Exif FlashpixVersion 48 49 48 48 Exif.Photo.FlashpixVersion Undefined 4 48 49 48 48
0xa001 Exif ColorSpace sRGB Exif.Photo.ColorSpace Short 1 sRGB
0xa002 Exif PixelXDimension 1600 Exif.Photo.PixelXDimension Long 1 1600
0xa003 Exif PixelYDimension 2400 Exif.Photo.PixelYDimension Long 1 2400
0xa005 Exif InteroperabilityTag 6738 Exif.Photo.InteroperabilityTag Long 1 6738
0xa300 Exif FileSource Digital still camera Exif.Photo.FileSource Undefined 1 Digital still camera
0x0001 Iop InteroperabilityIndex R98 Exif.Iop.InteroperabilityIndex Ascii 4 R98
0x0002 Iop InteroperabilityVersion 48 49 48 48 Exif.Iop.InteroperabilityVersion Undefined 4 48 49 48 48
0x0100 IFD1 ImageWidth 133 Exif.Thumbnail.ImageWidth Long 1 133
0x0101 IFD1 ImageLength 200 Exif.Thumbnail.ImageLength Long 1 200
0x0103 IFD1 Compression JPEG Exif.Thumbnail.Compression Short 1 JPEG
0x0112 IFD1 Orientation top, left Exif.Thumbnail.Orientation Short 1 top, left
0x0201 IFD1 JPEGInterchangeFormat 0 Exif.Thumbnail.JPEGInterchangeFormat Long 1 0
0x0202 IFD1 JPEGInterchangeFormatLength 6144 Exif.Thumbnail.JPEGInterchangeFormatLength Long 1 6144

1888
test/data/write-test.out
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save