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

Implemented print modes, part 2

Browse Source
v0.27.3
Andreas Huggel 22 years ago
parent 28295c5d80
commit 04eb1f992b
2 changed files with 73 additions and 17 deletions
Show Stats Download Patch File Download Diff File

71
src/actions.cpp
Unescape Escape View File

@ -20,13 +20,13 @@
*/
/*
File: actions.cpp
Version: $Name: $ $Revision: 1.5 $
Version: $Name: $ $Revision: 1.6 $
Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
History: 08-Dec-03, ahu: created
*/
// *****************************************************************************
#include "rcsid.hpp"
EXIV2_RCSID("@(#) $Name: $ $Revision: 1.5 $ $RCSfile: actions.cpp,v $")
EXIV2_RCSID("@(#) $Name: $ $Revision: 1.6 $ $RCSfile: actions.cpp,v $")
// *****************************************************************************
// included header files
@ -44,6 +44,7 @@ EXIV2_RCSID("@(#) $Name: $ $Revision: 1.5 $ $RCSfile: actions.cpp,v $")
#include <cstring>
#include <cstdio>
#include <ctime>
#include <cmath>
// *****************************************************************************
// local declarations
@ -114,7 +115,8 @@ namespace Action {
} // TaskFactory::create
int Print::run(const std::string& path)
try {
try {
path_ = path;
Exif::ExifData exifData;
int rc = exifData.read(path);
if (rc) {
@ -138,17 +140,61 @@ namespace Action {
void Print::printSummary(const Exif::ExifData& exifData)
{
align_ = 15;
std::cout << std::setw(align_) << std::setfill(' ') << std::left
<< "Filename" << ": " << path_ << "\n";
printTag(exifData, "Image.OtherTags.Make", "Camera make");
printTag(exifData, "Image.OtherTags.Model", "Camera model");
printTag(exifData, "Image.DateTime.DateTimeOriginal", "Image Timestamp");
printTag(exifData, "Image.CaptureConditions.ExposureTime", "Exposure time");
printTag(exifData, "Image.CaptureConditions.FNumber", "Aperture");
Exif::ExifData::const_iterator md;
// Exposure time: Try ExposureTime, failing that, try ShutterSpeedValue
std::ostringstream exposure;
md = exifData.findKey("Image.CaptureConditions.ExposureTime");
if (md != exifData.end()) {
exposure << *md;
}
else {
md = exifData.findKey("Image.CaptureConditions.ShutterSpeedValue");
if (md != exifData.end()) {
float f = exp2f(md->toFloat()) + 0.5;
if (f > 1) {
exposure << "1/" << static_cast<long>(f) << " s";
}
else {
exposure << static_cast<long>(1/f) << " s";
}
}
}
if (md != exifData.end()) {
std::cout << std::setw(align_) << std::setfill(' ') << std::left
<< "Exposure time" << ": " << exposure.str() << "\n";
}
// Aperture, get if from FNumber and, failing that, try ApertureValue
std::ostringstream aperture;
md = exifData.findKey("Image.CaptureConditions.FNumber");
if (md != exifData.end()) {
aperture << *md;
}
else {
md = exifData.findKey("Image.CaptureConditions.ApertureValue");
if (md != exifData.end()) {
aperture << std::fixed << std::setprecision(1)
<< "f/" << exp2f(md->toFloat()/2);
}
}
if (md != exifData.end()) {
std::cout << std::setw(align_) << std::setfill(' ') << std::left
<< "Aperture" << ": " << aperture.str() << "\n";
}
printTag(exifData, "Image.CaptureConditions.Flash", "Flash");
printTag(exifData, "Image.CaptureConditions.ISOSpeedRatings", "ISO");
printTag(exifData, "Image.CaptureConditions.ExposureProgram", "Program");
printTag(exifData, "Image.CaptureConditions.FocalLength", "Focal length");
printTag(exifData, "Image.CaptureConditions.MeteringMode", "Metering mode");
// Todo: Add size of IFD1 to thumbnail data size
std::cout << std::setw(15) << std::setfill(' ') << std::left
std::cout << std::setw(align_) << std::setfill(' ') << std::left
<< "Thumbnail" << ": ";
switch (exifData.thumbnailType()) {
case Exif::Thumbnail::none: std::cout << "None\n"; break;
@ -159,21 +205,24 @@ namespace Action {
std::cout << "TIFF, " << exifData.thumbnailSize() << " Bytes\n";
break;
}
std::cout << "\n";
} // Print::printSummary
void Print::printTag(const Exif::ExifData& exifData,
const std::string& key,
const std::string& label)
int Print::printTag(const Exif::ExifData& exifData,
const std::string& key,
const std::string& label)
{
int rc = 0;
Exif::ExifData::const_iterator md = exifData.findKey(key);
if (md != exifData.end()) {
std::cout << std::setw(15) << std::setfill(' ') << std::left
std::cout << std::setw(align_) << std::setfill(' ') << std::left
<< label << ": " << *md << "\n";
rc = 1;
}
return rc;
} // Print::printTag
void Print::printInterpreted(const Exif::ExifData& exifData)
{
Exif::ExifData::const_iterator md;

19
src/actions.hpp
Unescape Escape View File

@ -22,7 +22,7 @@
@file actions.hpp
@brief Implements base class Task, TaskFactory and the various supported
actions (derived from Task).
@version $Name: $ $Revision: 1.3 $
@version $Name: $ $Revision: 1.4 $
@author Andreas Huggel (ahu)
<a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
@date 11-Dec-03, ahu: created
@ -144,25 +144,32 @@ namespace Action {
//! %Print the %Exif (or other metadata) of a file to stdout
class Print : public Task {
public:
virtual ~Print() {}
virtual int run(const std::string& path);
typedef std::auto_ptr<Print> AutoPtr;
AutoPtr clone() const;
//! Print %Exif summary information
void printSummary(const Exif::ExifData& exifData);
void printSummary(const Exif::ExifData& exifData);
//! Print the interpreted value for each %Exif tag
void printInterpreted(const Exif::ExifData& exifData);
//! Print uninterpreted %Exif information
void printValues(const Exif::ExifData& exifData);
//! Print %Exif information in hexdump format
void printHexdump(const Exif::ExifData& exifData);
//! Print one summary line with a label and requested data
void printTag(const Exif::ExifData& exifData,
const std::string& key,
const std::string& label);
/*!
@brief Print one summary line with a label and requested data.
Return 1 if a line was written, 0 if the key was not found.
*/
int printTag(const Exif::ExifData& exifData,
const std::string& key,
const std::string& label);
private:
virtual Task* clone_() const;
std::string path_;
int align_; // for the alignment of the summary output
};
/*!

Write Preview
Loading…
Cancel
Save