diff --git a/include/exiv2/easyaccess.hpp b/include/exiv2/easyaccess.hpp index a77809b4..29c301a5 100644 --- a/include/exiv2/easyaccess.hpp +++ b/include/exiv2/easyaccess.hpp @@ -42,6 +42,8 @@ namespace Exiv2 { EXIV2API ExifData::const_iterator orientation(const ExifData& ed); //! Return the ISO speed used to shoot the image EXIV2API ExifData::const_iterator isoSpeed(const ExifData& ed); + //! Return the date and time when the original image data was generated + EXIV2API ExifData::const_iterator dateTimeOriginal(const ExifData& ed); //! Return the flash bias value EXIV2API ExifData::const_iterator flashBias(const ExifData& ed); //! Return the exposure mode setting @@ -74,12 +76,34 @@ namespace Exiv2 { EXIV2API ExifData::const_iterator exposureTime(const ExifData& ed); //! Return the F number EXIV2API ExifData::const_iterator fNumber(const ExifData& ed); + //! Return the shutter speed value + EXIV2API ExifData::const_iterator shutterSpeedValue(const ExifData& ed); + //! Return the aperture value + EXIV2API ExifData::const_iterator apertureValue(const ExifData& ed); + //! Return the brightness value + EXIV2API ExifData::const_iterator brightnessValue(const ExifData& ed); + //! Return the exposure bias value + EXIV2API ExifData::const_iterator exposureBiasValue(const ExifData& ed); + //! Return the max aperture value + EXIV2API ExifData::const_iterator maxApertureValue(const ExifData& ed); //! Return the subject distance EXIV2API ExifData::const_iterator subjectDistance(const ExifData& ed); + //! Return the kind of light source + EXIV2API ExifData::const_iterator lightSource(const ExifData& ed); + //! Return the status of flash + EXIV2API ExifData::const_iterator flash(const ExifData& ed); //! Return the camera serial number EXIV2API ExifData::const_iterator serialNumber(const ExifData& ed); //! Return the focal length setting EXIV2API ExifData::const_iterator focalLength(const ExifData& ed); + //! Return the subject location and area + EXIV2API ExifData::const_iterator subjectArea(const ExifData& ed); + //! Return the flash energy + EXIV2API ExifData::const_iterator flashEnergy(const ExifData& ed); + //! Return the exposure index + EXIV2API ExifData::const_iterator exposureIndex(const ExifData& ed); + //! Return the image sensor type + EXIV2API ExifData::const_iterator sensingMethod(const ExifData& ed); //! Return the AF point EXIV2API ExifData::const_iterator afPoint(const ExifData& ed); diff --git a/samples/easyaccess-test.cpp b/samples/easyaccess-test.cpp index a6bf8cfc..ef505936 100644 --- a/samples/easyaccess-test.cpp +++ b/samples/easyaccess-test.cpp @@ -19,6 +19,7 @@ struct EasyAccess { static const EasyAccess easyAccess[] = { { "Orientation", Exiv2::orientation }, { "ISO speed", Exiv2::isoSpeed }, + { "Date & time original", Exiv2::dateTimeOriginal }, { "Flash bias", Exiv2::flashBias }, { "Exposure mode", Exiv2::exposureMode }, { "Scene mode", Exiv2::sceneMode }, @@ -35,9 +36,20 @@ static const EasyAccess easyAccess[] = { { "Camera model", Exiv2::model }, { "Exposure time", Exiv2::exposureTime }, { "FNumber", Exiv2::fNumber }, + { "Shutter speed value", Exiv2::shutterSpeedValue }, + { "Aperture value", Exiv2::apertureValue }, + { "Brightness value", Exiv2::brightnessValue }, + { "Exposure bias", Exiv2::exposureBiasValue }, + { "Max aperture value", Exiv2::maxApertureValue }, { "Subject distance", Exiv2::subjectDistance }, + { "Light source", Exiv2::lightSource }, + { "Flash", Exiv2::flash }, { "Camera serial number", Exiv2::serialNumber }, { "Focal length", Exiv2::focalLength }, + { "Subject location/area", Exiv2::subjectArea }, + { "Flash energy", Exiv2::flashEnergy }, + { "Exposure index", Exiv2::exposureIndex }, + { "Sensing method", Exiv2::sensingMethod }, { "AF point", Exiv2::afPoint } }; @@ -58,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/actions.cpp b/src/actions.cpp index a941d677..a890e29f 100644 --- a/src/actions.cpp +++ b/src/actions.cpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004-2018 Exiv2 authors + * Copyright (C) 2004-2020 Exiv2 authors * This program is part of the Exiv2 distribution. * * This program is free software; you can redistribute it and/or @@ -312,126 +312,6 @@ namespace Action { return -3; } - // Camera make - printTag(exifData, "Exif.Image.Make", _("Camera make")); - - // Camera model - printTag(exifData, "Exif.Image.Model", _("Camera model")); - - // Image Timestamp - printTag(exifData, "Exif.Photo.DateTimeOriginal", _("Image timestamp")); - - // Image number - // Todo: Image number for cameras other than Canon - printTag(exifData, "Exif.Canon.FileNumber", _("Image number")); - - // Exposure time - // From ExposureTime, failing that, try ShutterSpeedValue - printLabel(_("Exposure time")); - bool done = 0 != printTag(exifData, "Exif.Photo.ExposureTime"); - if (!done) { - done = 0 != printTag(exifData, "Exif.Photo.ShutterSpeedValue"); - } - std::cout << std::endl; - - // Aperture - // Get if from FNumber and, failing that, try ApertureValue - { - printLabel(_("Aperture")); - bool done = 0 != printTag(exifData, "Exif.Photo.FNumber"); - if (!done) { - done = 0 != printTag(exifData, "Exif.Photo.ApertureValue"); - } - std::cout << std::endl; - - // Exposure bias - printTag(exifData, "Exif.Photo.ExposureBiasValue", _("Exposure bias")); - - // Flash - printTag(exifData, "Exif.Photo.Flash", _("Flash")); - - // Flash bias - printTag(exifData, Exiv2::flashBias, _("Flash bias")); - - // Actual focal length and 35 mm equivalent - // Todo: Calculate 35 mm equivalent a la jhead - Exiv2::ExifData::const_iterator md; - printLabel(_("Focal length")); - if (1 == printTag(exifData, "Exif.Photo.FocalLength")) { - md = exifData.findKey( - Exiv2::ExifKey("Exif.Photo.FocalLengthIn35mmFilm")); - if (md != exifData.end()) { - std::cout << " ("<< _("35 mm equivalent") << ": " - << md->print(&exifData) << ")"; - } - } - else { - printTag(exifData, "Exif.Canon.FocalLength"); - } - std::cout << std::endl; - } - - // Subject distance - { - printLabel(_("Subject distance")); - bool done = 0 != printTag(exifData, "Exif.Photo.SubjectDistance"); - if (!done) { - printTag(exifData, "Exif.CanonSi.SubjectDistance"); - printTag(exifData, "Exif.CanonFi.FocusDistanceLower"); - printTag(exifData, "Exif.CanonFi.FocusDistanceUpper"); - } - std::cout << std::endl; - } - - // ISO speed - printTag(exifData, Exiv2::isoSpeed, _("ISO speed")); - - // Exposure mode - printTag(exifData, Exiv2::exposureMode, _("Exposure mode")); - - // Metering mode - printTag(exifData, "Exif.Photo.MeteringMode", _("Metering mode")); - - // Macro mode - printTag(exifData, Exiv2::macroMode, _("Macro mode")); - - // Image quality setting (compression) - printTag(exifData, Exiv2::imageQuality, _("Image quality")); - - // Exif Resolution - { - printLabel(_("Exif Resolution")); - long xdim = 0; - long ydim = 0; - if (image->mimeType() == "image/tiff") { - xdim = image->pixelWidth(); - ydim = image->pixelHeight(); - } - else { - Exiv2::ExifData::const_iterator md = exifData.findKey(Exiv2::ExifKey("Exif.Image.ImageWidth")); - if (md == exifData.end()) { - md = exifData.findKey(Exiv2::ExifKey("Exif.Photo.PixelXDimension")); - } - if (md != exifData.end() && md->count() > 0) { - xdim = md->toLong(); - } - md = exifData.findKey(Exiv2::ExifKey("Exif.Image.ImageLength")); - if (md == exifData.end()) { - md = exifData.findKey(Exiv2::ExifKey("Exif.Photo.PixelYDimension")); - } - if (md != exifData.end() && md->count() > 0) { - ydim = md->toLong(); - } - } - if (xdim != 0 && ydim != 0) { - std::cout << xdim << " x " << ydim; - } - std::cout << std::endl; - } - - // White balance - printTag(exifData, Exiv2::whiteBalance, _("White balance")); - // Thumbnail printLabel(_("Thumbnail")); Exiv2::ExifThumbC exifThumb(exifData); @@ -451,11 +331,26 @@ namespace Action { } std::cout << std::endl; - // Copyright - printTag(exifData, "Exif.Image.Copyright", _("Copyright")); + printTag(exifData, Exiv2::make , _("Camera make") ); + printTag(exifData, Exiv2::model , _("Camera model") ); + printTag(exifData, Exiv2::dateTimeOriginal , _("Image timestamp") ); + printTag(exifData, "Exif.Canon.FileNumber" , _("File number") ); + printTag(exifData, Exiv2::exposureTime , _("Exposure time") , Exiv2::shutterSpeedValue ); + printTag(exifData, Exiv2::fNumber , _("Aperture") , Exiv2::apertureValue ); + printTag(exifData, Exiv2::exposureBiasValue , _("Exposure bias") ); + printTag(exifData, Exiv2::flash , _("Flash") ); + printTag(exifData, Exiv2::flashBias , _("Flash bias") ); + printTag(exifData, Exiv2::focalLength , _("Focal length") ); + printTag(exifData, Exiv2::subjectDistance , _("Subject distance") ); + printTag(exifData, Exiv2::isoSpeed , _("ISO speed") ); + printTag(exifData, Exiv2::exposureMode , _("Exposure mode") ); + printTag(exifData, Exiv2::meteringMode , _("Metering mode") ); + printTag(exifData, Exiv2::macroMode , _("Macro mode") ); + printTag(exifData, Exiv2::imageQuality , _("Image quality") ); + printTag(exifData, Exiv2::whiteBalance , _("White balance") ); + printTag(exifData, "Exif.Image.Copyright" , _("Copyright") ); + printTag(exifData, "Exif.Photo.UserComment" , _("Exif comment") ); - // Exif Comment - printTag(exifData, "Exif.Photo.UserComment", _("Exif comment")); std::cout << std::endl; return 0; @@ -491,7 +386,8 @@ namespace Action { int Print::printTag(const Exiv2::ExifData& exifData, EasyAccessFct easyAccessFct, - const std::string& label) const + const std::string& label, + EasyAccessFct easyAccessFctFallback) const { int rc = 0; if (!label.empty()) { @@ -502,6 +398,14 @@ namespace Action { md->write(std::cout, &exifData); rc = 1; } + else if (NULL != easyAccessFctFallback) + { + md = easyAccessFctFallback(exifData); + if (md != exifData.end()) { + md->write(std::cout, &exifData); + rc = 1; + } + } if (!label.empty()) std::cout << std::endl; return rc; } // Print::printTag diff --git a/src/actions.hpp b/src/actions.hpp index 0e4fc062..e63613cd 100644 --- a/src/actions.hpp +++ b/src/actions.hpp @@ -187,7 +187,8 @@ namespace Action { */ int printTag(const Exiv2::ExifData& exifData, EasyAccessFct easyAccessFct, - const std::string& label) const; + const std::string& label ="", + EasyAccessFct easyAccessFctFallback =NULL) const; private: virtual Print* clone_() const; diff --git a/src/easyaccess.cpp b/src/easyaccess.cpp index 9302d6cc..dcc3fb0d 100644 --- a/src/easyaccess.cpp +++ b/src/easyaccess.cpp @@ -183,6 +183,15 @@ namespace Exiv2 { return md; } + ExifData::const_iterator dateTimeOriginal(const ExifData& ed) + { + static const char* keys[] = { + "Exif.Photo.DateTimeOriginal", + "Exif.Image.DateTimeOriginal" + }; + return findMetadatum(ed, keys, EXV_COUNTOF(keys)); + } + ExifData::const_iterator flashBias(const ExifData& ed) { static const char* keys[] = { @@ -461,6 +470,51 @@ namespace Exiv2 { return findMetadatum(ed, keys, EXV_COUNTOF(keys)); } + ExifData::const_iterator shutterSpeedValue(const ExifData& ed) + { + static const char* keys[] = { + "Exif.Photo.ShutterSpeedValue", + "Exif.Image.ShutterSpeedValue" + }; + return findMetadatum(ed, keys, EXV_COUNTOF(keys)); + } + + ExifData::const_iterator apertureValue(const ExifData& ed) + { + static const char* keys[] = { + "Exif.Photo.ApertureValue", + "Exif.Image.ApertureValue" + }; + return findMetadatum(ed, keys, EXV_COUNTOF(keys)); + } + + ExifData::const_iterator brightnessValue(const ExifData& ed) + { + static const char* keys[] = { + "Exif.Photo.BrightnessValue", + "Exif.Image.BrightnessValue" + }; + return findMetadatum(ed, keys, EXV_COUNTOF(keys)); + } + + ExifData::const_iterator exposureBiasValue(const ExifData& ed) + { + static const char* keys[] = { + "Exif.Photo.ExposureBiasValue", + "Exif.Image.ExposureBiasValue" + }; + return findMetadatum(ed, keys, EXV_COUNTOF(keys)); + } + + ExifData::const_iterator maxApertureValue(const ExifData& ed) + { + static const char* keys[] = { + "Exif.Photo.MaxApertureValue", + "Exif.Image.MaxApertureValue" + }; + return findMetadatum(ed, keys, EXV_COUNTOF(keys)); + } + ExifData::const_iterator subjectDistance(const ExifData& ed) { static const char* keys[] = { @@ -482,6 +536,24 @@ namespace Exiv2 { return findMetadatum(ed, keys, EXV_COUNTOF(keys)); } + ExifData::const_iterator lightSource(const ExifData& ed) + { + static const char* keys[] = { + "Exif.Photo.LightSource", + "Exif.Image.LightSource" + }; + return findMetadatum(ed, keys, EXV_COUNTOF(keys)); + } + + ExifData::const_iterator flash(const ExifData& ed) + { + static const char* keys[] = { + "Exif.Photo.Flash", + "Exif.Image.Flash" + }; + return findMetadatum(ed, keys, EXV_COUNTOF(keys)); + } + ExifData::const_iterator serialNumber(const ExifData& ed) { static const char* keys[] = { @@ -512,6 +584,42 @@ namespace Exiv2 { return findMetadatum(ed, keys, EXV_COUNTOF(keys)); } + ExifData::const_iterator subjectArea(const ExifData& ed) + { + static const char* keys[] = { + "Exif.Photo.SubjectArea", + "Exif.Image.SubjectLocation" + }; + return findMetadatum(ed, keys, EXV_COUNTOF(keys)); + } + + ExifData::const_iterator flashEnergy(const ExifData& ed) + { + static const char* keys[] = { + "Exif.Photo.FlashEnergy", + "Exif.Image.FlashEnergy" + }; + return findMetadatum(ed, keys, EXV_COUNTOF(keys)); + } + + ExifData::const_iterator exposureIndex(const ExifData& ed) + { + static const char* keys[] = { + "Exif.Photo.ExposureIndex", + "Exif.Image.ExposureIndex" + }; + return findMetadatum(ed, keys, EXV_COUNTOF(keys)); + } + + ExifData::const_iterator sensingMethod(const ExifData& ed) + { + static const char* keys[] = { + "Exif.Photo.SensingMethod", + "Exif.Image.SensingMethod" + }; + return findMetadatum(ed, keys, EXV_COUNTOF(keys)); + } + ExifData::const_iterator afPoint(const ExifData& ed) { static const char* keys[] = { diff --git a/test/data/exiv2-test.out b/test/data/exiv2-test.out index 614d49fa..3c05d2f9 100644 --- a/test/data/exiv2-test.out +++ b/test/data/exiv2-test.out @@ -236,10 +236,11 @@ File 2/16: 20031214_000043.jpg 20031214_000043.jpg File size : 12425 Bytes 20031214_000043.jpg MIME type : image/jpeg 20031214_000043.jpg Image size : 150 x 91 +20031214_000043.jpg Thumbnail : image/jpeg, 5448 Bytes 20031214_000043.jpg Camera make : Canon 20031214_000043.jpg Camera model : Canon PowerShot S40 20031214_000043.jpg Image timestamp : 2003:12:14 00:00:43 -20031214_000043.jpg Image number : 117-1771 +20031214_000043.jpg File number : 117-1771 20031214_000043.jpg Exposure time : 1/500 s 20031214_000043.jpg Aperture : F4.9 20031214_000043.jpg Exposure bias : 0 EV @@ -252,9 +253,7 @@ File 2/16: 20031214_000043.jpg 20031214_000043.jpg Metering mode : Center weighted average 20031214_000043.jpg Macro mode : Off 20031214_000043.jpg Image quality : Superfine -20031214_000043.jpg Exif Resolution : 2272 x 1704 20031214_000043.jpg White balance : Auto -20031214_000043.jpg Thumbnail : image/jpeg, 5448 Bytes 20031214_000043.jpg Copyright : 20031214_000043.jpg Exif comment : @@ -263,25 +262,24 @@ File 3/16: 20000506_020544.jpg 20000506_020544.jpg File size : 19152 Bytes 20000506_020544.jpg MIME type : image/jpeg 20000506_020544.jpg Image size : 150 x 91 +20000506_020544.jpg Thumbnail : image/jpeg, 7829 Bytes 20000506_020544.jpg Camera make : NIKON 20000506_020544.jpg Camera model : E990 20000506_020544.jpg Image timestamp : 2000:05:06 02:05:44 -20000506_020544.jpg Image number : +20000506_020544.jpg File number : 20000506_020544.jpg Exposure time : 0.0111982 s 20000506_020544.jpg Aperture : F7 20000506_020544.jpg Exposure bias : 0 EV 20000506_020544.jpg Flash : No flash 20000506_020544.jpg Flash bias : 20000506_020544.jpg Focal length : 8.2 mm -20000506_020544.jpg Subject distance: +20000506_020544.jpg Subject distance: Unknown 20000506_020544.jpg ISO speed : 100 20000506_020544.jpg Exposure mode : Aperture priority 20000506_020544.jpg Metering mode : Center weighted average 20000506_020544.jpg Macro mode : 20000506_020544.jpg Image quality : FINE -20000506_020544.jpg Exif Resolution : 2048 x 1536 20000506_020544.jpg White balance : AUTO -20000506_020544.jpg Thumbnail : image/jpeg, 7829 Bytes 20000506_020544.jpg Copyright : 20000506_020544.jpg Exif comment : @@ -290,25 +288,24 @@ File 4/16: 20040329_224245.jpg 20040329_224245.jpg File size : 44129 Bytes 20040329_224245.jpg MIME type : image/jpeg 20040329_224245.jpg Image size : 150 x 91 +20040329_224245.jpg Thumbnail : image/jpeg, 8930 Bytes 20040329_224245.jpg Camera make : NIKON CORPORATION 20040329_224245.jpg Camera model : NIKON D70 20040329_224245.jpg Image timestamp : 2004:03:29 22:42:45 -20040329_224245.jpg Image number : +20040329_224245.jpg File number : 20040329_224245.jpg Exposure time : 1/250 s 20040329_224245.jpg Aperture : F9 20040329_224245.jpg Exposure bias : 0 EV 20040329_224245.jpg Flash : No flash 20040329_224245.jpg Flash bias : -20040329_224245.jpg Focal length : 50.0 mm (35 mm equivalent: 75.0 mm) -20040329_224245.jpg Subject distance: +20040329_224245.jpg Focal length : 50.0 mm +20040329_224245.jpg Subject distance: 5.31 m 20040329_224245.jpg ISO speed : 200 20040329_224245.jpg Exposure mode : Auto 20040329_224245.jpg Metering mode : Multi-segment 20040329_224245.jpg Macro mode : 20040329_224245.jpg Image quality : FINE -20040329_224245.jpg Exif Resolution : 3008 x 2000 20040329_224245.jpg White balance : AUTO -20040329_224245.jpg Thumbnail : image/jpeg, 8930 Bytes 20040329_224245.jpg Copyright : 20040329_224245.jpg Exif comment : charset=Ascii @@ -317,10 +314,11 @@ File 5/16: 20010405_235039.jpg 20010405_235039.jpg File size : 11984 Bytes 20010405_235039.jpg MIME type : image/jpeg 20010405_235039.jpg Image size : 150 x 91 +20010405_235039.jpg Thumbnail : image/jpeg, 4662 Bytes 20010405_235039.jpg Camera make : NIKON 20010405_235039.jpg Camera model : E950 20010405_235039.jpg Image timestamp : 2001:04:05 23:50:39 -20010405_235039.jpg Image number : +20010405_235039.jpg File number : 20010405_235039.jpg Exposure time : 1/77 s 20010405_235039.jpg Aperture : F5.5 20010405_235039.jpg Exposure bias : 0 EV @@ -333,9 +331,7 @@ File 5/16: 20010405_235039.jpg 20010405_235039.jpg Metering mode : Multi-segment 20010405_235039.jpg Macro mode : 20010405_235039.jpg Image quality : (12) -20010405_235039.jpg Exif Resolution : 1600 x 1200 20010405_235039.jpg White balance : Auto -20010405_235039.jpg Thumbnail : image/jpeg, 4662 Bytes 20010405_235039.jpg Copyright : 20010405_235039.jpg Exif comment : @@ -344,10 +340,11 @@ File 6/16: 20030925_201850.jpg 20030925_201850.jpg File size : 17033 Bytes 20030925_201850.jpg MIME type : image/jpeg 20030925_201850.jpg Image size : 150 x 91 +20030925_201850.jpg Thumbnail : image/jpeg, 9728 Bytes 20030925_201850.jpg Camera make : Canon 20030925_201850.jpg Camera model : Canon EOS 300D DIGITAL 20030925_201850.jpg Image timestamp : 2003:09:25 20:18:50 -20030925_201850.jpg Image number : 103-0390 +20030925_201850.jpg File number : 103-0390 20030925_201850.jpg Exposure time : 1/80 s 20030925_201850.jpg Aperture : F5.6 20030925_201850.jpg Exposure bias : 0 EV @@ -360,9 +357,7 @@ File 6/16: 20030925_201850.jpg 20030925_201850.jpg Metering mode : Multi-segment 20030925_201850.jpg Macro mode : (0) 20030925_201850.jpg Image quality : Fine -20030925_201850.jpg Exif Resolution : 3072 x 2048 20030925_201850.jpg White balance : Auto -20030925_201850.jpg Thumbnail : image/jpeg, 9728 Bytes 20030925_201850.jpg Copyright : 20030925_201850.jpg Exif comment : @@ -371,10 +366,11 @@ File 7/16: 20001026_044550.jpg 20001026_044550.jpg File size : 26485 Bytes 20001026_044550.jpg MIME type : image/jpeg 20001026_044550.jpg Image size : 150 x 91 +20001026_044550.jpg Thumbnail : image/tiff, 20916 Bytes 20001026_044550.jpg Camera make : Eastman Kodak Company 20001026_044550.jpg Camera model : DC210 Zoom (V05.00) 20001026_044550.jpg Image timestamp : 2000:10:26 04:45:50 -20001026_044550.jpg Image number : +20001026_044550.jpg File number : 20001026_044550.jpg Exposure time : 1/30 s 20001026_044550.jpg Aperture : F4 20001026_044550.jpg Exposure bias : 0 EV @@ -387,9 +383,7 @@ File 7/16: 20001026_044550.jpg 20001026_044550.jpg Metering mode : Center weighted average 20001026_044550.jpg Macro mode : 20001026_044550.jpg Image quality : -20001026_044550.jpg Exif Resolution : 20001026_044550.jpg White balance : -20001026_044550.jpg Thumbnail : image/tiff, 20916 Bytes 20001026_044550.jpg Copyright : 20001026_044550.jpg Exif comment : @@ -398,25 +392,24 @@ File 8/16: 20030926_111535.jpg 20030926_111535.jpg File size : 15537 Bytes 20030926_111535.jpg MIME type : image/jpeg 20030926_111535.jpg Image size : 150 x 91 +20030926_111535.jpg Thumbnail : image/jpeg, 9573 Bytes 20030926_111535.jpg Camera make : FUJIFILM 20030926_111535.jpg Camera model : FinePixS2Pro 20030926_111535.jpg Image timestamp : 2003:09:26 11:15:35 -20030926_111535.jpg Image number : +20030926_111535.jpg File number : 20030926_111535.jpg Exposure time : 1/60 s 20030926_111535.jpg Aperture : F4 20030926_111535.jpg Exposure bias : +1/2 EV 20030926_111535.jpg Flash : Yes, compulsory 20030926_111535.jpg Flash bias : -20030926_111535.jpg Focal length : 28.0 mm (35 mm equivalent: 42.0 mm) +20030926_111535.jpg Focal length : 28.0 mm 20030926_111535.jpg Subject distance: 20030926_111535.jpg ISO speed : 400 20030926_111535.jpg Exposure mode : Aperture priority 20030926_111535.jpg Metering mode : Center weighted average 20030926_111535.jpg Macro mode : 20030926_111535.jpg Image quality : NORMAL -20030926_111535.jpg Exif Resolution : 3024 x 2016 20030926_111535.jpg White balance : Daylight -20030926_111535.jpg Thumbnail : image/jpeg, 9573 Bytes 20030926_111535.jpg Copyright : 20030926_111535.jpg Exif comment : @@ -425,25 +418,24 @@ File 9/16: 20040316_075137.jpg 20040316_075137.jpg File size : 18307 Bytes 20040316_075137.jpg MIME type : image/jpeg 20040316_075137.jpg Image size : 150 x 91 +20040316_075137.jpg Thumbnail : image/jpeg, 11998 Bytes 20040316_075137.jpg Camera make : SIGMA 20040316_075137.jpg Camera model : SIGMA SD10 20040316_075137.jpg Image timestamp : 2004:03:16 07:51:37 -20040316_075137.jpg Image number : +20040316_075137.jpg File number : 20040316_075137.jpg Exposure time : 8 s 20040316_075137.jpg Aperture : F5.6 20040316_075137.jpg Exposure bias : +1 EV 20040316_075137.jpg Flash : No flash 20040316_075137.jpg Flash bias : -20040316_075137.jpg Focal length : 14.0 mm (35 mm equivalent: 24.0 mm) +20040316_075137.jpg Focal length : 14.0 mm 20040316_075137.jpg Subject distance: 20040316_075137.jpg ISO speed : 100 20040316_075137.jpg Exposure mode : Manual 20040316_075137.jpg Metering mode : Multi-segment 20040316_075137.jpg Macro mode : 20040316_075137.jpg Image quality : 12 -20040316_075137.jpg Exif Resolution : 2268 x 1512 20040316_075137.jpg White balance : Incandescent -20040316_075137.jpg Thumbnail : image/jpeg, 11998 Bytes 20040316_075137.jpg Copyright : 20040316_075137.jpg Exif comment : @@ -452,10 +444,11 @@ File 10/16: 20040208_093744.jpg 20040208_093744.jpg File size : 19152 Bytes 20040208_093744.jpg MIME type : image/jpeg 20040208_093744.jpg Image size : 150 x 91 +20040208_093744.jpg Thumbnail : image/jpeg, 7306 Bytes 20040208_093744.jpg Camera make : OLYMPUS CORPORATION 20040208_093744.jpg Camera model : C8080WZ 20040208_093744.jpg Image timestamp : 2004:02:08 09:37:44 -20040208_093744.jpg Image number : +20040208_093744.jpg File number : 20040208_093744.jpg Exposure time : 1/160 s 20040208_093744.jpg Aperture : F4.5 20040208_093744.jpg Exposure bias : +7/10 EV @@ -468,9 +461,7 @@ File 10/16: 20040208_093744.jpg 20040208_093744.jpg Metering mode : Multi-segment 20040208_093744.jpg Macro mode : Off 20040208_093744.jpg Image quality : (7) -20040208_093744.jpg Exif Resolution : 3264 x 2448 20040208_093744.jpg White balance : Manual -20040208_093744.jpg Thumbnail : image/jpeg, 7306 Bytes 20040208_093744.jpg Copyright : 20040208_093744.jpg Exif comment : @@ -479,25 +470,24 @@ File 11/16: 20050218_212016.jpg 20050218_212016.jpg File size : 32041 Bytes 20050218_212016.jpg MIME type : image/jpeg 20050218_212016.jpg Image size : 150 x 91 +20050218_212016.jpg Thumbnail : image/jpeg, 10308 Bytes 20050218_212016.jpg Camera make : Panasonic 20050218_212016.jpg Camera model : DMC-FZ5 20050218_212016.jpg Image timestamp : 2005:02:18 21:20:16 -20050218_212016.jpg Image number : +20050218_212016.jpg File number : 20050218_212016.jpg Exposure time : 1/400 s 20050218_212016.jpg Aperture : F4.5 20050218_212016.jpg Exposure bias : 0 EV 20050218_212016.jpg Flash : No, compulsory 20050218_212016.jpg Flash bias : 0 -20050218_212016.jpg Focal length : 6.0 mm (35 mm equivalent: 36.0 mm) +20050218_212016.jpg Focal length : 6.0 mm 20050218_212016.jpg Subject distance: 20050218_212016.jpg ISO speed : 80 20050218_212016.jpg Exposure mode : Auto 20050218_212016.jpg Metering mode : Multi-segment 20050218_212016.jpg Macro mode : Off 20050218_212016.jpg Image quality : High -20050218_212016.jpg Exif Resolution : 2560 x 1920 20050218_212016.jpg White balance : Auto -20050218_212016.jpg Thumbnail : image/jpeg, 10308 Bytes 20050218_212016.jpg Copyright : 20050218_212016.jpg Exif comment : @@ -506,10 +496,11 @@ File 12/16: 20050527_051833.jpg 20050527_051833.jpg File size : 22844 Bytes 20050527_051833.jpg MIME type : image/jpeg 20050527_051833.jpg Image size : 150 x 91 +20050527_051833.jpg Thumbnail : image/jpeg, 15605 Bytes 20050527_051833.jpg Camera make : SONY 20050527_051833.jpg Camera model : DSC-W7 20050527_051833.jpg Image timestamp : 2005:05:27 05:18:33 -20050527_051833.jpg Image number : +20050527_051833.jpg File number : 20050527_051833.jpg Exposure time : 1/40 s 20050527_051833.jpg Aperture : F2.8 20050527_051833.jpg Exposure bias : 0 EV @@ -522,9 +513,7 @@ File 12/16: 20050527_051833.jpg 20050527_051833.jpg Metering mode : Multi-segment 20050527_051833.jpg Macro mode : 20050527_051833.jpg Image quality : -20050527_051833.jpg Exif Resolution : 300 x 225 20050527_051833.jpg White balance : Auto -20050527_051833.jpg Thumbnail : image/jpeg, 15605 Bytes 20050527_051833.jpg Copyright : 20050527_051833.jpg Exif comment : @@ -534,10 +523,11 @@ Warning: Directory Canon has an unexpected next pointer; ignored. 20060802_095200.jpg File size : 20733 Bytes 20060802_095200.jpg MIME type : image/jpeg 20060802_095200.jpg Image size : 150 x 91 +20060802_095200.jpg Thumbnail : image/jpeg, 6260 Bytes 20060802_095200.jpg Camera make : Canon 20060802_095200.jpg Camera model : Canon EOS 20D 20060802_095200.jpg Image timestamp : 2006:08:02 09:52:00 -20060802_095200.jpg Image number : +20060802_095200.jpg File number : 20060802_095200.jpg Exposure time : 1/60 s 20060802_095200.jpg Aperture : F5.6 20060802_095200.jpg Exposure bias : 0 EV @@ -550,9 +540,7 @@ Warning: Directory Canon has an unexpected next pointer; ignored. 20060802_095200.jpg Metering mode : Partial 20060802_095200.jpg Macro mode : Off 20060802_095200.jpg Image quality : Fine -20060802_095200.jpg Exif Resolution : 3504 x 2336 20060802_095200.jpg White balance : Custom -20060802_095200.jpg Thumbnail : image/jpeg, 6260 Bytes 20060802_095200.jpg Copyright : 20060802_095200.jpg Exif comment : @@ -561,10 +549,11 @@ File 14/16: 20001004_015404.jpg 20001004_015404.jpg File size : 20617 Bytes 20001004_015404.jpg MIME type : image/jpeg 20001004_015404.jpg Image size : 150 x 91 +20001004_015404.jpg Thumbnail : image/jpeg, 13824 Bytes 20001004_015404.jpg Camera make : Canon 20001004_015404.jpg Camera model : Canon EOS D30 20001004_015404.jpg Image timestamp : 2000:10:04 01:54:04 -20001004_015404.jpg Image number : 889-8982 +20001004_015404.jpg File number : 889-8982 20001004_015404.jpg Exposure time : 1/350 s 20001004_015404.jpg Aperture : F4 20001004_015404.jpg Exposure bias : 0 EV @@ -577,9 +566,7 @@ File 14/16: 20001004_015404.jpg 20001004_015404.jpg Metering mode : Multi-segment 20001004_015404.jpg Macro mode : Off 20001004_015404.jpg Image quality : Fine -20001004_015404.jpg Exif Resolution : 2160 x 1440 20001004_015404.jpg White balance : Daylight -20001004_015404.jpg Thumbnail : image/jpeg, 13824 Bytes 20001004_015404.jpg Copyright : 20001004_015404.jpg Exif comment : @@ -588,10 +575,11 @@ File 15/16: 20060127_225027.jpg 20060127_225027.jpg File size : 13449 Bytes 20060127_225027.jpg MIME type : image/jpeg 20060127_225027.jpg Image size : 150 x 91 +20060127_225027.jpg Thumbnail : image/jpeg, 6137 Bytes 20060127_225027.jpg Camera make : Canon 20060127_225027.jpg Camera model : Canon PowerShot A520 20060127_225027.jpg Image timestamp : 2006:01:27 22:50:27 -20060127_225027.jpg Image number : 114-1468 +20060127_225027.jpg File number : 114-1468 20060127_225027.jpg Exposure time : 1/1000 s 20060127_225027.jpg Aperture : F4 20060127_225027.jpg Exposure bias : 0 EV @@ -604,9 +592,7 @@ File 15/16: 20060127_225027.jpg 20060127_225027.jpg Metering mode : Multi-segment 20060127_225027.jpg Macro mode : Off 20060127_225027.jpg Image quality : Fine -20060127_225027.jpg Exif Resolution : 2272 x 1704 20060127_225027.jpg White balance : Auto -20060127_225027.jpg Thumbnail : image/jpeg, 6137 Bytes 20060127_225027.jpg Copyright : 20060127_225027.jpg Exif comment : @@ -615,10 +601,11 @@ File 16/16: 20110626_213900.psd 20110626_213900.psd File size : 52770 Bytes 20110626_213900.psd MIME type : image/x-photoshop 20110626_213900.psd Image size : 150 x 91 +20110626_213900.psd Thumbnail : None 20110626_213900.psd Camera make : 20110626_213900.psd Camera model : 20110626_213900.psd Image timestamp : -20110626_213900.psd Image number : +20110626_213900.psd File number : 20110626_213900.psd Exposure time : 20110626_213900.psd Aperture : 20110626_213900.psd Exposure bias : @@ -631,9 +618,7 @@ File 16/16: 20110626_213900.psd 20110626_213900.psd Metering mode : 20110626_213900.psd Macro mode : 20110626_213900.psd Image quality : -20110626_213900.psd Exif Resolution : 150 x 91 20110626_213900.psd White balance : -20110626_213900.psd Thumbnail : None 20110626_213900.psd Copyright : 20110626_213900.psd Exif comment : diff --git a/test/data/iso65k-test.out b/test/data/iso65k-test.out index dbb8fe07..553fba0e 100644 --- a/test/data/iso65k-test.out +++ b/test/data/iso65k-test.out @@ -3,10 +3,11 @@ File name : exiv2-iso65k-0001.jpg File size : 4799 Bytes MIME type : image/jpeg Image size : 150 x 91 +Thumbnail : None Camera make : Camera model : Image timestamp : -Image number : +File number : Exposure time : Aperture : Exposure bias : @@ -19,9 +20,7 @@ Exposure mode : Metering mode : Macro mode : Image quality : -Exif Resolution : White balance : -Thumbnail : None Copyright : Exif comment : @@ -30,10 +29,11 @@ File name : exiv2-iso65k-0002.jpg File size : 4823 Bytes MIME type : image/jpeg Image size : 150 x 91 +Thumbnail : None Camera make : Camera model : Image timestamp : -Image number : +File number : Exposure time : Aperture : Exposure bias : @@ -46,9 +46,7 @@ Exposure mode : Metering mode : Macro mode : Image quality : -Exif Resolution : White balance : -Thumbnail : None Copyright : Exif comment : @@ -57,10 +55,11 @@ File name : exiv2-iso65k-0003.jpg File size : 4799 Bytes MIME type : image/jpeg Image size : 150 x 91 +Thumbnail : None Camera make : Camera model : Image timestamp : -Image number : +File number : Exposure time : Aperture : Exposure bias : @@ -73,9 +72,7 @@ Exposure mode : Metering mode : Macro mode : Image quality : -Exif Resolution : White balance : -Thumbnail : None Copyright : Exif comment : @@ -84,10 +81,11 @@ File name : exiv2-iso65k-0004.jpg File size : 4799 Bytes MIME type : image/jpeg Image size : 150 x 91 +Thumbnail : None Camera make : Camera model : Image timestamp : -Image number : +File number : Exposure time : Aperture : Exposure bias : @@ -100,9 +98,7 @@ Exposure mode : Metering mode : Macro mode : Image quality : -Exif Resolution : White balance : -Thumbnail : None Copyright : Exif comment : @@ -111,10 +107,11 @@ File name : exiv2-iso65k-0005.jpg File size : 4811 Bytes MIME type : image/jpeg Image size : 150 x 91 +Thumbnail : None Camera make : Camera model : Image timestamp : -Image number : +File number : Exposure time : Aperture : Exposure bias : @@ -127,9 +124,7 @@ Exposure mode : Metering mode : Macro mode : Image quality : -Exif Resolution : White balance : -Thumbnail : None Copyright : Exif comment : @@ -138,10 +133,11 @@ File name : exiv2-iso65k-0006.jpg File size : 4811 Bytes MIME type : image/jpeg Image size : 150 x 91 +Thumbnail : None Camera make : Camera model : Image timestamp : -Image number : +File number : Exposure time : Aperture : Exposure bias : @@ -154,9 +150,7 @@ Exposure mode : Metering mode : Macro mode : Image quality : -Exif Resolution : White balance : -Thumbnail : None Copyright : Exif comment : @@ -165,10 +159,11 @@ File name : exiv2-iso65k-0007.jpg File size : 4811 Bytes MIME type : image/jpeg Image size : 150 x 91 +Thumbnail : None Camera make : Camera model : Image timestamp : -Image number : +File number : Exposure time : Aperture : Exposure bias : @@ -181,9 +176,7 @@ Exposure mode : Metering mode : Macro mode : Image quality : -Exif Resolution : White balance : -Thumbnail : None Copyright : Exif comment : @@ -192,10 +185,11 @@ File name : exiv2-iso65k-0008.jpg File size : 4823 Bytes MIME type : image/jpeg Image size : 150 x 91 +Thumbnail : None Camera make : Camera model : Image timestamp : -Image number : +File number : Exposure time : Aperture : Exposure bias : @@ -208,9 +202,7 @@ Exposure mode : Metering mode : Macro mode : Image quality : -Exif Resolution : White balance : -Thumbnail : None Copyright : Exif comment : @@ -219,10 +211,11 @@ File name : exiv2-iso65k-0009.jpg File size : 4823 Bytes MIME type : image/jpeg Image size : 150 x 91 +Thumbnail : None Camera make : Camera model : Image timestamp : -Image number : +File number : Exposure time : Aperture : Exposure bias : @@ -235,9 +228,7 @@ Exposure mode : Metering mode : Macro mode : Image quality : -Exif Resolution : White balance : -Thumbnail : None Copyright : Exif comment : @@ -246,10 +237,11 @@ File name : exiv2-iso65k-0010.jpg File size : 4811 Bytes MIME type : image/jpeg Image size : 150 x 91 +Thumbnail : None Camera make : Camera model : Image timestamp : -Image number : +File number : Exposure time : Aperture : Exposure bias : @@ -262,9 +254,7 @@ Exposure mode : Metering mode : Macro mode : Image quality : -Exif Resolution : White balance : -Thumbnail : None Copyright : Exif comment : @@ -273,10 +263,11 @@ File name : exiv2-iso65k-0011.jpg File size : 4811 Bytes MIME type : image/jpeg Image size : 150 x 91 +Thumbnail : None Camera make : Camera model : Image timestamp : -Image number : +File number : Exposure time : Aperture : Exposure bias : @@ -289,9 +280,7 @@ Exposure mode : Metering mode : Macro mode : Image quality : -Exif Resolution : White balance : -Thumbnail : None Copyright : Exif comment : diff --git a/tests/bugfixes/github/test_CVE_2017_1000127.py b/tests/bugfixes/github/test_CVE_2017_1000127.py index a8d9f5ea..46425802 100644 --- a/tests/bugfixes/github/test_CVE_2017_1000127.py +++ b/tests/bugfixes/github/test_CVE_2017_1000127.py @@ -14,10 +14,11 @@ class TestPoC(metaclass=system_tests.CaseMeta): File size : 310 Bytes MIME type : image/tiff Image size : 200 x 130 +Thumbnail : None Camera make : Camera model : Image timestamp : -Image number : +File number : Exposure time : Aperture : Exposure bias : @@ -30,9 +31,7 @@ Exposure mode : Metering mode : Macro mode : Image quality : -Exif Resolution : 200 x 130 White balance : -Thumbnail : None Copyright : Exif comment : diff --git a/tests/bugfixes/github/test_CVE_2017_11336.py b/tests/bugfixes/github/test_CVE_2017_11336.py index 943cb8ff..94c2dcf5 100644 --- a/tests/bugfixes/github/test_CVE_2017_11336.py +++ b/tests/bugfixes/github/test_CVE_2017_11336.py @@ -14,10 +14,11 @@ class TestCvePoC(metaclass=system_tests.CaseMeta): File size : 60 Bytes MIME type : image/tiff Image size : 0 x 0 +Thumbnail : None Camera make : Camera model : Image timestamp : -Image number : +File number : Exposure time : Aperture : Exposure bias : @@ -30,9 +31,7 @@ Exposure mode : Metering mode : Macro mode : Image quality : -Exif Resolution : White balance : -Thumbnail : None Copyright : Exif comment : diff --git a/tests/bugfixes/github/test_CVE_2017_11339.py b/tests/bugfixes/github/test_CVE_2017_11339.py index de2fa373..a56a76ea 100644 --- a/tests/bugfixes/github/test_CVE_2017_11339.py +++ b/tests/bugfixes/github/test_CVE_2017_11339.py @@ -13,10 +13,11 @@ class TestCvePoC(metaclass=system_tests.CaseMeta): File size : 60 Bytes MIME type : image/x-olympus-orf Image size : 0 x 0 +Thumbnail : None Camera make : Camera model : Image timestamp : -Image number : +File number : Exposure time : Aperture : Exposure bias : @@ -29,9 +30,7 @@ Exposure mode : Metering mode : Macro mode : Image quality : -Exif Resolution : White balance : -Thumbnail : None Copyright : Exif comment : diff --git a/tests/bugfixes/github/test_CVE_2017_11340.py b/tests/bugfixes/github/test_CVE_2017_11340.py index d550d55e..7715cc21 100644 --- a/tests/bugfixes/github/test_CVE_2017_11340.py +++ b/tests/bugfixes/github/test_CVE_2017_11340.py @@ -13,10 +13,11 @@ class TestCvePoC(metaclass=system_tests.CaseMeta): File size : 60 Bytes MIME type : image/x-olympus-orf Image size : 0 x 0 +Thumbnail : None Camera make : Camera model : Image timestamp : -Image number : +File number : Exposure time : Aperture : Exposure bias : @@ -29,9 +30,7 @@ Exposure mode : Metering mode : Macro mode : Image quality : -Exif Resolution : White balance : -Thumbnail : None Copyright : Exif comment : diff --git a/tests/bugfixes/github/test_CVE_2017_11553.py b/tests/bugfixes/github/test_CVE_2017_11553.py index f9aee725..323c21f8 100644 --- a/tests/bugfixes/github/test_CVE_2017_11553.py +++ b/tests/bugfixes/github/test_CVE_2017_11553.py @@ -14,10 +14,11 @@ class TestCvePoC(metaclass=system_tests.CaseMeta): File size : 632 Bytes MIME type : image/tiff Image size : 0 x 0 +Thumbnail : None Camera make : Camera model : Image timestamp : -Image number : +File number : Exposure time : Aperture : Exposure bias : @@ -30,9 +31,7 @@ Exposure mode : Metering mode : Macro mode : Image quality : -Exif Resolution : White balance : -Thumbnail : None Copyright : Exif comment : diff --git a/tests/bugfixes/github/test_CVE_2017_11591.py b/tests/bugfixes/github/test_CVE_2017_11591.py index b701a666..eabc851c 100644 --- a/tests/bugfixes/github/test_CVE_2017_11591.py +++ b/tests/bugfixes/github/test_CVE_2017_11591.py @@ -14,10 +14,11 @@ class TestCvePoC(metaclass=system_tests.CaseMeta): File size : 2044 Bytes MIME type : image/tiff Image size : 0 x 0 +Thumbnail : None Camera make : Camera model : Image timestamp : -Image number : +File number : Exposure time : Aperture : Exposure bias : @@ -30,9 +31,7 @@ Exposure mode : Metering mode : Macro mode : Image quality : -Exif Resolution : White balance : -Thumbnail : None Copyright : Exif comment : diff --git a/tests/bugfixes/github/test_CVE_2017_11592.py b/tests/bugfixes/github/test_CVE_2017_11592.py index bd9d9c1a..3a63c651 100644 --- a/tests/bugfixes/github/test_CVE_2017_11592.py +++ b/tests/bugfixes/github/test_CVE_2017_11592.py @@ -14,10 +14,11 @@ class TestCvePoC(metaclass=system_tests.CaseMeta): File size : 523 Bytes MIME type : image/tiff Image size : 0 x 0 +Thumbnail : None Camera make : Camera model : Image timestamp : -Image number : +File number : Exposure time : Aperture : Exposure bias : @@ -30,9 +31,7 @@ Exposure mode : Metering mode : Macro mode : Image quality : -Exif Resolution : White balance : -Thumbnail : None Copyright : Exif comment : diff --git a/tests/bugfixes/github/test_CVE_2017_11683.py b/tests/bugfixes/github/test_CVE_2017_11683.py index 0b6bf71a..5c7732fd 100644 --- a/tests/bugfixes/github/test_CVE_2017_11683.py +++ b/tests/bugfixes/github/test_CVE_2017_11683.py @@ -14,10 +14,11 @@ class TestCvePoC(metaclass=system_tests.CaseMeta): File size : 712 Bytes MIME type : image/tiff Image size : 0 x 0 +Thumbnail : None Camera make : Camera model : Image timestamp : -Image number : +File number : Exposure time : Aperture : Exposure bias : @@ -30,9 +31,7 @@ Exposure mode : Metering mode : Macro mode : Image quality : -Exif Resolution : White balance : -Thumbnail : None Copyright : Exif comment : diff --git a/tests/bugfixes/github/test_CVE_2017_12956.py b/tests/bugfixes/github/test_CVE_2017_12956.py index 779a89ba..5b690bf6 100644 --- a/tests/bugfixes/github/test_CVE_2017_12956.py +++ b/tests/bugfixes/github/test_CVE_2017_12956.py @@ -14,10 +14,11 @@ class TestCvePoC(metaclass=system_tests.CaseMeta): File size : 68 Bytes MIME type : image/x-olympus-orf Image size : 0 x 0 +Thumbnail : None Camera make : Camera model : Image timestamp : -Image number : +File number : Exposure time : Aperture : Exposure bias : @@ -30,9 +31,7 @@ Exposure mode : Metering mode : Macro mode : Image quality : -Exif Resolution : White balance : -Thumbnail : None Copyright : Exif comment : diff --git a/tests/bugfixes/github/test_CVE_2017_12957.py b/tests/bugfixes/github/test_CVE_2017_12957.py index 98e1b27a..9f5e61d4 100644 --- a/tests/bugfixes/github/test_CVE_2017_12957.py +++ b/tests/bugfixes/github/test_CVE_2017_12957.py @@ -14,10 +14,11 @@ class TestCvePoC(metaclass=system_tests.CaseMeta): File size : 60 Bytes MIME type : image/x-olympus-orf Image size : 0 x 0 +Thumbnail : None Camera make : Camera model : Image timestamp : -Image number : +File number : Exposure time : Aperture : Exposure bias : @@ -30,9 +31,7 @@ Exposure mode : Metering mode : Macro mode : Image quality : -Exif Resolution : White balance : -Thumbnail : None Copyright : Exif comment : diff --git a/tests/bugfixes/github/test_CVE_2017_14857.py b/tests/bugfixes/github/test_CVE_2017_14857.py index b70d18dd..f7c0fb2a 100644 --- a/tests/bugfixes/github/test_CVE_2017_14857.py +++ b/tests/bugfixes/github/test_CVE_2017_14857.py @@ -15,10 +15,11 @@ class TestCvePoC(metaclass=system_tests.CaseMeta): File size : 20274 Bytes MIME type : image/tiff Image size : 12336 x 12336 +Thumbnail : None Camera make : 00000000 Camera model : 000000000000 Image timestamp : -Image number : +File number : Exposure time : Aperture : Exposure bias : @@ -31,9 +32,7 @@ Exposure mode : Metering mode : Macro mode : Image quality : -Exif Resolution : 12336 x 12336 White balance : -Thumbnail : None Copyright : 00000 Exif comment : diff --git a/tests/bugfixes/github/test_CVE_2017_14858.py b/tests/bugfixes/github/test_CVE_2017_14858.py index d08bd805..52610530 100644 --- a/tests/bugfixes/github/test_CVE_2017_14858.py +++ b/tests/bugfixes/github/test_CVE_2017_14858.py @@ -14,10 +14,11 @@ class TestCvePoC(metaclass=system_tests.CaseMeta): File size : 331696 Bytes MIME type : image/tiff Image size : 0 x 12336 +Thumbnail : None Camera make : 0000 Camera model : 0000000000000 Image timestamp : -Image number : +File number : Exposure time : Aperture : Exposure bias : @@ -30,9 +31,7 @@ Exposure mode : Metering mode : Macro mode : Image quality : -Exif Resolution : White balance : -Thumbnail : None Copyright : Exif comment : diff --git a/tests/bugfixes/github/test_CVE_2017_14861.py b/tests/bugfixes/github/test_CVE_2017_14861.py index ee98780e..9ca9e90e 100644 --- a/tests/bugfixes/github/test_CVE_2017_14861.py +++ b/tests/bugfixes/github/test_CVE_2017_14861.py @@ -16,10 +16,11 @@ class TestCvePoC(metaclass=system_tests.CaseMeta): File size : 340 Bytes MIME type : image/tiff Image size : 0 x 0 +Thumbnail : None Camera make : Camera model : Image timestamp : -Image number : +File number : Exposure time : Aperture : Exposure bias : @@ -32,9 +33,7 @@ Exposure mode : Metering mode : Macro mode : Image quality : -Exif Resolution : White balance : -Thumbnail : None Copyright : Exif comment : diff --git a/tests/bugfixes/github/test_CVE_2017_14863.py b/tests/bugfixes/github/test_CVE_2017_14863.py index ff95e2ef..410cc60d 100644 --- a/tests/bugfixes/github/test_CVE_2017_14863.py +++ b/tests/bugfixes/github/test_CVE_2017_14863.py @@ -14,10 +14,11 @@ class TestCvePoC(metaclass=system_tests.CaseMeta): File size : 24550 Bytes MIME type : image/tiff Image size : 12336 x 12336 +Thumbnail : None Camera make : Camera model : Image timestamp : -Image number : +File number : Exposure time : Aperture : Exposure bias : @@ -30,9 +31,7 @@ Exposure mode : Metering mode : Macro mode : Image quality : -Exif Resolution : 12336 x 12336 White balance : -Thumbnail : None Copyright : Exif comment : diff --git a/tests/bugfixes/github/test_CVE_2017_14865.py b/tests/bugfixes/github/test_CVE_2017_14865.py index 6e070690..ea4e51e0 100644 --- a/tests/bugfixes/github/test_CVE_2017_14865.py +++ b/tests/bugfixes/github/test_CVE_2017_14865.py @@ -14,10 +14,11 @@ class TestCvePoC(metaclass=system_tests.CaseMeta): File size : 352222 Bytes MIME type : image/tiff Image size : 17 x 12288 +Thumbnail : None Camera make : Camera model : Image timestamp : -Image number : +File number : Exposure time : Aperture : Exposure bias : @@ -30,9 +31,7 @@ Exposure mode : Metering mode : Macro mode : Image quality : -Exif Resolution : 17 x 12288 White balance : -Thumbnail : None Copyright : Exif comment : diff --git a/tests/bugfixes/github/test_CVE_2017_14866.py b/tests/bugfixes/github/test_CVE_2017_14866.py index 09ab89d5..b1bc56f8 100644 --- a/tests/bugfixes/github/test_CVE_2017_14866.py +++ b/tests/bugfixes/github/test_CVE_2017_14866.py @@ -14,10 +14,11 @@ class TestCvePoC(metaclass=system_tests.CaseMeta): File size : 309965 Bytes MIME type : image/tiff Image size : 17 x 12305 +Thumbnail : None Camera make : Camera model : Image timestamp : -Image number : +File number : Exposure time : Aperture : Exposure bias : @@ -30,9 +31,7 @@ Exposure mode : Metering mode : Macro mode : Image quality : -Exif Resolution : 17 x 12305 White balance : -Thumbnail : None Copyright : Exif comment : diff --git a/tests/bugfixes/redmine/test_1305.py b/tests/bugfixes/redmine/test_1305.py index 8a651354..10b24fb4 100644 --- a/tests/bugfixes/redmine/test_1305.py +++ b/tests/bugfixes/redmine/test_1305.py @@ -25,10 +25,11 @@ Error: Directory Pentax, entry 0x3030 has invalid size 808464432*1; skipping ent File size : 12341 Bytes MIME type : image/jpeg Image size : 0 x 0 +Thumbnail : None Camera make : PENTAX000000000000000000000000000000000000000000 Camera model : Image timestamp : -Image number : +File number : Exposure time : Aperture : Exposure bias : @@ -41,9 +42,7 @@ Exposure mode : Metering mode : Macro mode : Image quality : -Exif Resolution : White balance : -Thumbnail : None Copyright : Exif comment : diff --git a/tests/bugfixes/redmine/test_easyaccess.py b/tests/bugfixes/redmine/test_easyaccess.py index a489718b..ae34bb8d 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 diff --git a/tests/bugfixes/redmine/test_issue_1305.py b/tests/bugfixes/redmine/test_issue_1305.py index 9419a750..5a3d5c48 100644 --- a/tests/bugfixes/redmine/test_issue_1305.py +++ b/tests/bugfixes/redmine/test_issue_1305.py @@ -15,10 +15,11 @@ class PentaxImageWithIssues(metaclass=system_tests.CaseMeta): File size : 12341 Bytes MIME type : image/jpeg Image size : 0 x 0 +Thumbnail : None Camera make : PENTAX000000000000000000000000000000000000000000 Camera model : Image timestamp : -Image number : +File number : Exposure time : Aperture : Exposure bias : @@ -31,9 +32,7 @@ Exposure mode : Metering mode : Macro mode : Image quality : -Exif Resolution : White balance : -Thumbnail : None Copyright : Exif comment :