From 3ffd8077ac8fe1cd2082793d6b79bfc754f16742 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Fri, 27 Nov 2020 13:55:43 +0000 Subject: [PATCH] Add to test harness. --- test/data/exiv2-pr1409.exv | Bin 0 -> 13597 bytes tests/bugfixes/github/test_pr_1409.py | 51 ++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 test/data/exiv2-pr1409.exv create mode 100644 tests/bugfixes/github/test_pr_1409.py diff --git a/test/data/exiv2-pr1409.exv b/test/data/exiv2-pr1409.exv new file mode 100644 index 0000000000000000000000000000000000000000..a2dd11bd012a4570baa92a41c13820d69816a63b GIT binary patch literal 13597 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 literal 0 HcmV?d00001 diff --git a/tests/bugfixes/github/test_pr_1409.py b/tests/bugfixes/github/test_pr_1409.py new file mode 100644 index 00000000..113eb369 --- /dev/null +++ b/tests/bugfixes/github/test_pr_1409.py @@ -0,0 +1,51 @@ +# -*- coding: utf-8 -*- + +import system_tests + +class FujiFilm_IFD_Tags_pr1409(metaclass=system_tests.CaseMeta): + url = "https://github.com/Exiv2/exiv2/pull/1409" + + filename = "$data_path/exiv2-pr1409.exv" + commands = ["$exiv2 -g Fujifilm $filename"] + stderr = [""] + stdout = ["""Exif.Fujifilm.Version Undefined 4 48 49 51 48 +Exif.Fujifilm.SerialNumber Ascii 48 FF02B4550110 593534373734180817925330110168 +Exif.Fujifilm.Quality Ascii 8 NORMAL +Exif.Fujifilm.Sharpness Short 1 Normal +Exif.Fujifilm.WhiteBalance Short 1 Auto +Exif.Fujifilm.Color Short 1 Normal +Exif.Fujifilm.FlashMode Short 1 (38976) +Exif.Fujifilm.FlashStrength SRational 1 0/100 +Exif.Fujifilm.FocusMode Short 1 Auto +Exif.Fujifilm.SlowSync Short 1 Off +Exif.Fujifilm.PictureMode Short 1 Aperture-priority AE +Exif.Fujifilm.ShadowTone SLong 1 0 +Exif.Fujifilm.HighlightTone SLong 1 0 +Exif.Fujifilm.Continuous Short 1 Off +Exif.Fujifilm.SequenceNumber Short 1 0 +Exif.Fujifilm.BlurWarning Short 1 Off +Exif.Fujifilm.FocusWarning Short 1 Off +Exif.Fujifilm.ExposureWarning Short 1 Off +Exif.Fujifilm.DynamicRange Short 1 Standard +Exif.Fujifilm.FilmMode Short 1 F0/Standard (Provia) +Exif.Fujifilm.DynamicRangeSetting Short 1 Raw +Exif.Fujifilm.DevelopmentDynamicRange Short 1 100 +Exif.Fujifilm.MinFocalLength Rational 1 1800/100 +Exif.Fujifilm.MaxFocalLength Rational 1 5500/100 +Exif.Fujifilm.MaxApertureAtMinFocal Rational 1 280/100 +Exif.Fujifilm.MaxApertureAtMaxFocal Rational 1 400/100 +Exif.Fujifilm.Rating Long 1 0 +Exif.Fujifilm.RawImageFullWidth Long 1 6384 +Exif.Fujifilm.RawImageFullHeight Long 1 4182 +Exif.Fujifilm.BitsPerSample Long 1 14 +Exif.Fujifilm.StripOffsets Long 1 2048 +Exif.Fujifilm.StripByteCounts Long 1 53395776 +Exif.Fujifilm.BlackLevel Long 36 1022 1022 1022 1022 1022 1022 1022 1022 1022 1022 1022 1022 1022 1022 1022 1022 1022 1022 1022 1022 1022 1022 1022 1022 1022 1022 1022 1022 1022 1022 1022 1022 1022 1022 1022 1022 +Exif.Fujifilm.GeometricDistortionParams SRational 19 3749/9 502/1420 710/1420 870/1420 1004/1420 1123/1420 1230/1420 1328/1420 1420/1420 1506/1420 35789/65536 64000/65536 92105/65536 121578/65536 152315/65536 183578/65536 216947/65536 251473/65536 286000/65536 +Exif.Fujifilm.WB_GRBLevelsStandard Long 8 302 371 826 17 302 626 485 21 +Exif.Fujifilm.WB_GRBLevelsAuto Long 3 302 561 552 +Exif.Fujifilm.WB_GRBLevels Long 3 302 561 552 +Exif.Fujifilm.ChromaticAberrationParams SRational 29 3749/9 502/1420 710/1420 870/1420 1004/1420 1123/1420 1230/1420 1328/1420 1420/1420 1506/1420 4/65536 2/65536 -2/65536 -6/65536 -8/65536 -12/65536 -14/65536 -18/65536 -18/65536 -58/65536 -54/65536 -50/65536 -46/65536 -40/65536 -32/65536 -24/65536 -16/65536 -16/65536 3749/9 +Exif.Fujifilm.VignettingParams SRational 19 3749/9 502/1420 710/1420 870/1420 1004/1420 1123/1420 1230/1420 1328/1420 1420/1420 1506/1420 192752/2048 183960/2048 176751/2048 171126/2048 158275/2048 138976/2048 119700/2048 101213/2048 87673/2048 +"""] + retval = [0]