diff --git a/samples/easyaccess-test.cpp b/samples/easyaccess-test.cpp index 98c1d88c..ef505936 100644 --- a/samples/easyaccess-test.cpp +++ b/samples/easyaccess-test.cpp @@ -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"; diff --git a/src/easyaccess.cpp b/src/easyaccess.cpp index b7c889a2..dcc3fb0d 100644 --- a/src/easyaccess.cpp +++ b/src/easyaccess.cpp @@ -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)); diff --git a/tests/bugfixes/redmine/test_easyaccess.py b/tests/bugfixes/redmine/test_easyaccess.py index a489718b..8cebb49e 100644 --- a/tests/bugfixes/redmine/test_easyaccess.py +++ b/tests/bugfixes/redmine/test_easyaccess.py @@ -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