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

Fix easyaccess-test

Browse Source
This commit is contained in:
Miloš Komarčević 2020-11-03 11:03:46 +01:00
parent 95c0df6c14
commit 5e92d5e078
3 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
samples/easyaccess-test.cpp
View File

@ -19,7 +19,7 @@ struct EasyAccess {
static const EasyAccess easyAccess[] = {
{ "Orientation", Exiv2::orientation },
{ "ISO speed", Exiv2::isoSpeed },
{ "Date & time (original)", Exiv2::dateTimeOriginal },
{ "Date & time original", Exiv2::dateTimeOriginal },
{ "Flash bias", Exiv2::flashBias },
{ "Exposure mode", Exiv2::exposureMode },
{ "Scene mode", Exiv2::sceneMode },
@ -70,7 +70,7 @@ try {
for (unsigned int i = 0; i < EXV_COUNTOF(easyAccess); ++i) {
Exiv2::ExifData::const_iterator pos = easyAccess[i].findFct_(ed);
std::cout << std::setw(20) << std::left << easyAccess[i].label_;
std::cout << std::setw(21) << std::left << easyAccess[i].label_;
if (pos != ed.end()) {
std::cout << " (" << std::setw(35) << pos->key() << ") : "
<< pos->print(&ed) << "\n";

2
src/easyaccess.cpp
View File

@ -186,7 +186,7 @@ namespace Exiv2 {
ExifData::const_iterator dateTimeOriginal(const ExifData& ed)
{
static const char* keys[] = {
"Exif.Photo.DateTimeOriginal"
"Exif.Photo.DateTimeOriginal",
"Exif.Image.DateTimeOriginal"
};
return findMetadatum(ed, keys, EXV_COUNTOF(keys));

56
tests/bugfixes/redmine/test_easyaccess.py
View File

@ -16,28 +16,40 @@ class EasyaccessTest(metaclass=system_tests.CaseMeta):
"""File 1/1: $filename
Set Exif.Image.Make "Samsung" (Ascii)
""",
"""Orientation ( ) :
ISO speed ( ) :
Flash bias ( ) :
Exposure mode ( ) :
Scene mode ( ) :
Macro mode ( ) :
Image quality ( ) :
White balance ( ) :
Lens name ( ) :
Saturation ( ) :
Sharpness ( ) :
Contrast ( ) :
Scene capture type ( ) :
Metering mode ( ) :
Camera make (Exif.Image.Make ) : Samsung
Camera model ( ) :
Exposure time ( ) :
FNumber ( ) :
Subject distance ( ) :
Camera serial number ( ) :
Focal length ( ) :
AF point ( ) :
"""Orientation ( ) :
ISO speed ( ) :
Date & time original ( ) :
Flash bias ( ) :
Exposure mode ( ) :
Scene mode ( ) :
Macro mode ( ) :
Image quality ( ) :
White balance ( ) :
Lens name ( ) :
Saturation ( ) :
Sharpness ( ) :
Contrast ( ) :
Scene capture type ( ) :
Metering mode ( ) :
Camera make (Exif.Image.Make ) : Samsung
Camera model ( ) :
Exposure time ( ) :
FNumber ( ) :
Shutter speed value ( ) :
Aperture value ( ) :
Brightness value ( ) :
Exposure bias ( ) :
Max aperture value ( ) :
Subject distance ( ) :
Light source ( ) :
Flash ( ) :
Camera serial number ( ) :
Focal length ( ) :
Subject location/area ( ) :
Flash energy ( ) :
Exposure index ( ) :
Sensing method ( ) :
AF point ( ) :
"""
]
stderr = [""] * 2