diff --git a/test/data/conversions.out b/test/data/conversions.out index a27c7cbf..f885f648 100644 --- a/test/data/conversions.out +++ b/test/data/conversions.out @@ -42,9 +42,9 @@ Iptc.Application2.Caption String 20 How to fix this mess Testcase 6 ========== Exif.Image.ExifTag Long 1 26 -Exif.Photo.UserComment Undefined 59 charset="Jis" This is a JIS encoded Exif user comment. Or was it? +Exif.Photo.UserComment Undefined 59 charset=Jis This is a JIS encoded Exif user comment. Or was it? Xmp.exif.UserComment LangAlt 1 lang="x-default" This is a JIS encoded Exif user comment. Or was it? -Exif.Photo.UserComment Undefined 110 charset="Unicode" This is a JIS encoded Exif user comment. Or was it? +Exif.Photo.UserComment Undefined 110 charset=Unicode This is a JIS encoded Exif user comment. Or was it? File 1/1: m.xmp m.xmp: No IPTC data found in the file @@ -52,7 +52,7 @@ Testcase 7 ========== Xmp.exif.UserComment LangAlt 1 lang="x-default" This is a JIS encoded Exif user comment. Or was it? Exif.Image.ExifTag Long 1 26 -Exif.Photo.UserComment Undefined 110 charset="Unicode" This is a JIS encoded Exif user comment. Or was it? +Exif.Photo.UserComment Undefined 110 charset=Unicode This is a JIS encoded Exif user comment. Or was it? File 1/1: n.jpg n.jpg: No IPTC data found in the file diff --git a/test/data/exifdata-test.out b/test/data/exifdata-test.out index 4032cec9..eb251890 100644 --- a/test/data/exifdata-test.out +++ b/test/data/exifdata-test.out @@ -819,7 +819,7 @@ Exif.NikonFl1.0x0011 0x0011 Makernote Byte 3 Exif.Nikon3.ImageOptimization 0x00a9 Makernote Ascii 16 NORMAL Exif.Nikon3.Saturation 0x00aa Makernote Ascii 16 NORMAL Exif.Nikon3.VariProgram 0x00ab Makernote Ascii 16 -Exif.Photo.UserComment 0x9286 Exif Undefined 44 charset="Ascii" +Exif.Photo.UserComment 0x9286 Exif Undefined 44 charset=Ascii Exif.Photo.SubSecTime 0x9290 Exif Ascii 3 00 Exif.Photo.SubSecTimeOriginal 0x9291 Exif Ascii 3 00 Exif.Photo.SubSecTimeDigitized 0x9292 Exif Ascii 3 00 @@ -990,7 +990,7 @@ Exif.NikonFl1.0x0011 0x0011 Makernote Byte 3 Exif.Nikon3.ImageOptimization 0x00a9 Makernote Ascii 16 NORMAL Exif.Nikon3.Saturation 0x00aa Makernote Ascii 16 NORMAL Exif.Nikon3.VariProgram 0x00ab Makernote Ascii 16 -Exif.Photo.UserComment 0x9286 Exif Undefined 44 charset="Ascii" +Exif.Photo.UserComment 0x9286 Exif Undefined 44 charset=Ascii Exif.Photo.SubSecTime 0x9290 Exif Ascii 3 00 Exif.Photo.SubSecTimeOriginal 0x9291 Exif Ascii 3 00 Exif.Photo.SubSecTimeDigitized 0x9292 Exif Ascii 3 00 @@ -1162,7 +1162,7 @@ Exif.NikonFl1.0x0011 0x0011 Makernote Byte 3 Exif.Nikon3.ImageOptimization 0x00a9 Makernote Ascii 16 NORMAL Exif.Nikon3.Saturation 0x00aa Makernote Ascii 16 NORMAL Exif.Nikon3.VariProgram 0x00ab Makernote Ascii 16 -Exif.Photo.UserComment 0x9286 Exif Undefined 44 charset="Ascii" +Exif.Photo.UserComment 0x9286 Exif Undefined 44 charset=Ascii Exif.Photo.SubSecTime 0x9290 Exif Ascii 3 00 Exif.Photo.SubSecTimeOriginal 0x9291 Exif Ascii 3 00 Exif.Photo.SubSecTimeDigitized 0x9292 Exif Ascii 3 00 @@ -1334,7 +1334,7 @@ Exif.NikonFl1.0x0011 0x0011 Makernote Byte 3 Exif.Nikon3.ImageOptimization 0x00a9 Makernote Ascii 16 NORMAL Exif.Nikon3.Saturation 0x00aa Makernote Ascii 16 NORMAL Exif.Nikon3.VariProgram 0x00ab Makernote Ascii 16 -Exif.Photo.UserComment 0x9286 Exif Undefined 44 charset="Ascii" +Exif.Photo.UserComment 0x9286 Exif Undefined 44 charset=Ascii Exif.Photo.SubSecTime 0x9290 Exif Ascii 3 00 Exif.Photo.SubSecTimeOriginal 0x9291 Exif Ascii 3 00 Exif.Photo.SubSecTimeDigitized 0x9292 Exif Ascii 3 00 diff --git a/test/data/exiv2-test.out b/test/data/exiv2-test.out index 9ebae191..6c73f7ee 100644 --- a/test/data/exiv2-test.out +++ b/test/data/exiv2-test.out @@ -306,7 +306,7 @@ File 4/15: 20040329_224245.jpg 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" +20040329_224245.jpg Exif comment : charset=Ascii File 5/15: 20010405_235039.jpg 20010405_235039.jpg File name : 20010405_235039.jpg @@ -934,7 +934,7 @@ File 4/15: 20040329_224245.jpg 20040329_224245.jpg Exif.Nikon3.ImageOptimization Ascii 16 NORMAL 20040329_224245.jpg Exif.Nikon3.Saturation Ascii 16 NORMAL 20040329_224245.jpg Exif.Nikon3.VariProgram Ascii 16 -20040329_224245.jpg Exif.Photo.UserComment Undefined 44 charset="Ascii" +20040329_224245.jpg Exif.Photo.UserComment Undefined 44 charset=Ascii 20040329_224245.jpg Exif.Photo.SubSecTime Ascii 3 00 20040329_224245.jpg Exif.Photo.SubSecTimeOriginal Ascii 3 00 20040329_224245.jpg Exif.Photo.SubSecTimeDigitized Ascii 3 00 @@ -2547,7 +2547,7 @@ Compare image data and extracted data ------------------------------------ < 20040329_224245.jpg Exif.Nikon3.ImageOptimization Ascii 16 NORMAL < 20040329_224245.jpg Exif.Nikon3.Saturation Ascii 16 NORMAL < 20040329_224245.jpg Exif.Nikon3.VariProgram Ascii 16 -< 20040329_224245.jpg Exif.Photo.UserComment Undefined 44 charset="Ascii" +< 20040329_224245.jpg Exif.Photo.UserComment Undefined 44 charset=Ascii < 20040329_224245.jpg Exif.Photo.SubSecTime Ascii 3 00 < 20040329_224245.jpg Exif.Photo.SubSecTimeOriginal Ascii 3 00 < 20040329_224245.jpg Exif.Photo.SubSecTimeDigitized Ascii 3 00 @@ -4088,7 +4088,7 @@ Compare image data and extracted data ------------------------------------ > 20040329_224245.exv Exif.Nikon3.ImageOptimization Ascii 16 NORMAL > 20040329_224245.exv Exif.Nikon3.Saturation Ascii 16 NORMAL > 20040329_224245.exv Exif.Nikon3.VariProgram Ascii 16 -> 20040329_224245.exv Exif.Photo.UserComment Undefined 44 charset="Ascii" +> 20040329_224245.exv Exif.Photo.UserComment Undefined 44 charset=Ascii > 20040329_224245.exv Exif.Photo.SubSecTime Ascii 3 00 > 20040329_224245.exv Exif.Photo.SubSecTimeOriginal Ascii 3 00 > 20040329_224245.exv Exif.Photo.SubSecTimeDigitized Ascii 3 00 @@ -5849,7 +5849,7 @@ Compare original and inserted image data --------------------------------- < 20040329_224245.jpg Exif.Nikon3.ImageOptimization Ascii 16 NORMAL < 20040329_224245.jpg Exif.Nikon3.Saturation Ascii 16 NORMAL < 20040329_224245.jpg Exif.Nikon3.VariProgram Ascii 16 -< 20040329_224245.jpg Exif.Photo.UserComment Undefined 44 charset="Ascii" +< 20040329_224245.jpg Exif.Photo.UserComment Undefined 44 charset=Ascii < 20040329_224245.jpg Exif.Photo.SubSecTime Ascii 3 00 < 20040329_224245.jpg Exif.Photo.SubSecTimeOriginal Ascii 3 00 < 20040329_224245.jpg Exif.Photo.SubSecTimeDigitized Ascii 3 00 @@ -7390,7 +7390,7 @@ Compare original and inserted image data --------------------------------- > 20040329_224245.exv Exif.Nikon3.ImageOptimization Ascii 16 NORMAL > 20040329_224245.exv Exif.Nikon3.Saturation Ascii 16 NORMAL > 20040329_224245.exv Exif.Nikon3.VariProgram Ascii 16 -> 20040329_224245.exv Exif.Photo.UserComment Undefined 44 charset="Ascii" +> 20040329_224245.exv Exif.Photo.UserComment Undefined 44 charset=Ascii > 20040329_224245.exv Exif.Photo.SubSecTime Ascii 3 00 > 20040329_224245.exv Exif.Photo.SubSecTimeOriginal Ascii 3 00 > 20040329_224245.exv Exif.Photo.SubSecTimeDigitized Ascii 3 00 diff --git a/test/data/geotag-test.out b/test/data/geotag-test.out index a9dc0436..7252776f 100644 --- a/test/data/geotag-test.out +++ b/test/data/geotag-test.out @@ -8,7 +8,7 @@ Exif.GPSInfo.GPSAltitudeRef Byte 1 Below sea level Exif.GPSInfo.GPSAltitude Rational 1 14.3 m Exif.GPSInfo.GPSTimeStamp Rational 3 09:54:28 Exif.GPSInfo.GPSMapDatum Ascii 7 WGS-84 -Exif.GPSInfo.GPSProcessingMethod Undefined 18 charset="Ascii" HYBRID-FIX +Exif.GPSInfo.GPSProcessingMethod Undefined 18 charset=Ascii HYBRID-FIX Exif.GPSInfo.GPSDateStamp Ascii 20 2008:05:08 09:54:28 --- deleting the GPSInfo tags --- run geotag --- diff --git a/test/data/modify-test.out b/test/data/modify-test.out index 0f7c98b8..5247c8a8 100644 --- a/test/data/modify-test.out +++ b/test/data/modify-test.out @@ -18,7 +18,7 @@ exiv2-empty.jpg Exif.Image.DateTime Ascii 19 exiv2-empty.jpg Exif.Image.Artist Ascii 17 Vincent van Gogh exiv2-empty.jpg Exif.Image.WhitePoint Short 5 32 12 4 5 6 exiv2-empty.jpg Exif.Image.ExifTag Long 1 110 -exiv2-empty.jpg Exif.Photo.UserComment Undefined 37 charset="Ascii" This is an ASCII Exif comment +exiv2-empty.jpg Exif.Photo.UserComment Undefined 37 charset=Ascii This is an ASCII Exif comment File 2/2: exiv2-gc.jpg exiv2-gc.jpg Exif.Image.ImageDescription Ascii 18 Exif JPEG exiv2-gc.jpg Exif.Image.Make Ascii 8 Camera diff --git a/tests/bugfixes/github/test_issue_1046.py b/tests/bugfixes/github/test_issue_1046.py index 744f0b89..2378a5c3 100644 --- a/tests/bugfixes/github/test_issue_1046.py +++ b/tests/bugfixes/github/test_issue_1046.py @@ -23,7 +23,7 @@ class test_issue_1046Test(metaclass=CaseMeta): , "$exiv2 -pt -g GPSPro -g GPSArea $filename" , "$exiv2 -pv -g GPSPro -g GPSArea $filename" ] - stdout = ["""Exif.Photo.UserComment Undefined 12 charset="Unicode" AB + stdout = ["""Exif.Photo.UserComment Undefined 12 charset=Unicode AB Exif.GPSInfo.GPSVersionID Byte 4 2.2.0.0 Exif.GPSInfo.GPSLatitudeRef Ascii 2 North Exif.GPSInfo.GPSLatitude Rational 3 51deg 23' 13" @@ -33,10 +33,10 @@ Exif.GPSInfo.GPSAltitudeRef Byte 1 Above sea level Exif.GPSInfo.GPSAltitude Rational 1 104.2 m Exif.GPSInfo.GPSTimeStamp Rational 3 10:34:11 Exif.GPSInfo.GPSMapDatum Ascii 7 WGS-84 -Exif.GPSInfo.GPSProcessingMethod Undefined 18 charset="Ascii" HYBRID-FIX +Exif.GPSInfo.GPSProcessingMethod Undefined 18 charset=Ascii HYBRID-FIX Exif.GPSInfo.GPSAreaInformation Undefined 23 Surrey, England Exif.GPSInfo.GPSDateStamp Ascii 20 2020:02:02 10:34:11 -""","""0x9286 Photo UserComment Undefined 12 charset="Unicode" AB +""","""0x9286 Photo UserComment Undefined 12 charset=Unicode AB 0x0000 GPSInfo GPSVersionID Byte 4 2 2 0 0 0x0001 GPSInfo GPSLatitudeRef Ascii 2 N 0x0002 GPSInfo GPSLatitude Rational 3 51/1 23/1 13/1 @@ -46,19 +46,19 @@ Exif.GPSInfo.GPSDateStamp Ascii 20 2020:02:02 10:34:11 0x0006 GPSInfo GPSAltitude Rational 1 10420/100 0x0007 GPSInfo GPSTimeStamp Rational 3 10/1 34/1 11/1 0x0012 GPSInfo GPSMapDatum Ascii 7 WGS-84 -0x001b GPSInfo GPSProcessingMethod Undefined 18 charset="Ascii" HYBRID-FIX +0x001b GPSInfo GPSProcessingMethod Undefined 18 charset=Ascii HYBRID-FIX 0x001c GPSInfo GPSAreaInformation Undefined 23 Surrey, England 0x001d GPSInfo GPSDateStamp Ascii 20 2020:02:02 10:34:11 -""","","""Exif.Photo.UserComment Undefined 25 charset="Ascii" how now brown cow -""","""0x9286 Photo UserComment Undefined 25 charset="Ascii" how now brown cow -""","","""Exif.Photo.UserComment Undefined 12 charset="Unicode" AB -""","""0x9286 Photo UserComment Undefined 12 charset="Unicode" AB +""","","""Exif.Photo.UserComment Undefined 25 charset=Ascii how now brown cow +""","""0x9286 Photo UserComment Undefined 25 charset=Ascii how now brown cow +""","","""Exif.Photo.UserComment Undefined 12 charset=Unicode AB +""","""0x9286 Photo UserComment Undefined 12 charset=Unicode AB ""","","""Exif.Photo.UserComment Undefined 19 hello world ""","""0x9286 Photo UserComment Undefined 19 hello world -""","","","""Exif.GPSInfo.GPSProcessingMethod Undefined 18 charset="Unicode" Robin -Exif.GPSInfo.GPSAreaInformation Undefined 24 charset="Ascii" area information -""","""0x001b GPSInfo GPSProcessingMethod Undefined 18 charset="Unicode" Robin -0x001c GPSInfo GPSAreaInformation Undefined 24 charset="Ascii" area information +""","","","""Exif.GPSInfo.GPSProcessingMethod Undefined 18 charset=Unicode Robin +Exif.GPSInfo.GPSAreaInformation Undefined 24 charset=Ascii area information +""","""0x001b GPSInfo GPSProcessingMethod Undefined 18 charset=Unicode Robin +0x001c GPSInfo GPSAreaInformation Undefined 24 charset=Ascii area information """ ] stderr = [""]*len(commands) diff --git a/tests/bugfixes/redmine/test_issue_528.py b/tests/bugfixes/redmine/test_issue_528.py index 46694763..6b4e62a2 100644 --- a/tests/bugfixes/redmine/test_issue_528.py +++ b/tests/bugfixes/redmine/test_issue_528.py @@ -49,7 +49,7 @@ Exif.Photo.MakerNote Undefined 18 0 1 2 0 3 0 0 0 0 0 Exif.MakerNote.Offset Long 1 796 Exif.MakerNote.ByteOrder Ascii 3 MM Exif.Canon.0x0200 0x0300 0 -Exif.Photo.UserComment Undefined 37 charset="Ascii" binary comment +Exif.Photo.UserComment Undefined 37 charset=Ascii binary comment Exif.Photo.SubSecTime Ascii 3 81 Exif.Photo.SubSecTimeOriginal Ascii 3 81 Exif.Photo.SubSecTimeDigitized Ascii 3 81