[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:46:49 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=23841e3
The following commit has been merged in the master branch:
commit 23841e3d586cdfa5f98c8d632b93c9f08a0bf3cc
Author: Robin Mills <robin at clanmills.com>
Date: Tue Aug 30 10:53:35 2016 +0000
#1218 Work-in-progress on test/exifdata-test.sh
---
test/data/exifdata-test.out | 20 ++++++++++++--------
test/exifdata-test.sh | 4 +++-
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/test/data/exifdata-test.out b/test/data/exifdata-test.out
index 933a9b7..88a8b44 100644
--- a/test/data/exifdata-test.out
+++ b/test/data/exifdata-test.out
@@ -189,7 +189,7 @@ Exif.Photo.MaxApertureValue 0x9205 Exif Rational 1
Exif.Photo.MeteringMode 0x9207 Exif Short 1 1
Exif.Photo.Flash 0x9209 Exif Short 1 24
Exif.Photo.FocalLength 0x920a Exif Rational 1 682/32
-Exif.Photo.MakerNote 0x927c Exif Undefined 450 12 0 1 0 3 0 40 0 0 0 36 3 0 0 2 0 3 0 4 0 0 0 116 3 0 0 3 0 3 0 4 0 0 0 124 3 0 0 4 0 3 0 27 0 0 0 132 3 0 0 0 0 3 0 6 0 0 0 186 3 0 0 0 0 3 0 4 0 0 0 198 3 0 0 6 0 2 0 32 0 0 0 206 3 0 0 7 0 2 0 24 0 0 0 238 3 0 0 8 0 4 0 1 0 0 0 59 225 17 0 9 0 2 0 32 0 0 0 6 4 0 0 16 0 4 0 1 0 0 0 0 0 17 1 13 0 3 0 21 0 0 0 38 4 0 0 0 0 0 0 80 0 2 0 0 0 5 0 1 0 0 0 0 0 4 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 17 0 5 0 1 0 3 48 1 0 255 255 255 255 170 2 227 0 32 0 149 0 192 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 49 0 224 8 224 8 0 0 1 0 2 0 170 2 30 1 215 0 0 0 0 0 0 0 0 0 54 0 0 0 160 0 20 1 149 0 31 1 0 0 0 0 0 0 0 0 6 0 0 0 0 0 0 0 2 48 0 0 0 0 0 0 1 0 14 3 0 0 149 0 33 1 0 0 0 0 0 0 250 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 73 77 71 58 80 111 119 101 114 83 104 111 116 32 83 52 48 32 74 80 69 71 0 0 0 0 0 0 0 0 0 0 70 105 114 109 119 97 114 101 32 86 101 114 115 105 111 110 32 49 46 49 48 0 0 0 65 110 100 114 101 97 115 32 72 117 103 103 101 108 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 42 0 3 0 1 128 122 1 1 128 0 0 0 0 0 0 3 1 2 0 0 0 10 0 0 0 0 0 0 0 57 0 198 0 5 0 0 0 0 0 0 0
+Exif.Photo.MakerNote 0x927c Exif Undefined 450 12 0 1 0 3 0 40 0 0 0 36 3 0 0 2 0 3 0 4 0 0 0 116 3 0 0 3 0 3 0 4 0 0 0 124 3 0 0 4 0 3 0 27 0 0 0 132 3 0 0 0 0 3 0 6 0 0 0 186 3 0 0 0 0 3 0 4 0 0 0 198 3 0 0 6 0 2 0 32 0 0 0 206 3 0 0 7 0 2 0 24 0 0 0 238 3 0 0 8 0 4 0 1 0 0 0 59 225 17 0 9 0 2 0 32 0 0 0 6 4 0 0 16 0 4 0 1 0 0 0 0 0 17 1 13 0 3 0 21 0 0 0 38 4 0 0 0 0 0 0 80 0 2 0 0 0 5 0 1 0 0 0 0 0 4 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 17 0 5 0 1 0 3 48 1 0 255 255 255 255 170 2 227 0 32 0 149 0 192 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 49 0 224 8 224 8 0 0 1 0 2 0 170 2 30 1 215 0 0 0 0 0 0 0 0 0 54 0 0 0 160 0 20 1 149 0 31 1 0 0 0 0 0 0 0 0 6 0 0 0 0 0 0 0 2 48 0 0 0 0 0 0 1 0 14 3 0 0 149 0 33 1 0 0 0 0 0 0 250 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 73 77 71 58 80 111 119 101 114 83 104 111 116 32 83 52 48 32 74 80 69 71 0 0 0 0 0 0 0 0 0 0 70 105 114 109 119 97 114 101 32 86 101 114 115 105 111 110 32 49 46 49 48 0 0 0 65 110 100 114 101 97 115 32 72 117 103 103 101 108 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 42 0 3 0 1 128 122 1 1 128 0 0 0 0 0 0 3 1 2 0 0 0 10 0 0 0 0 0 0 0 57 0 198 0 5 0 0 0 0 0 0 0
Exif.MakerNote.Offset 0x0001 Makernote Long 1 654
Exif.MakerNote.ByteOrder 0x0002 Makernote Ascii 3 II
Exif.CanonCs.0x0000 0x0000 Makernote Short 1 80
@@ -224,7 +224,7 @@ Exif.CanonCs.0x001e 0x001e Makernote Short 1
Exif.CanonCs.0x001f 0x001f Makernote Short 1 0
Exif.CanonCs.FocusContinuous 0x0020 Makernote Short 1 0
Exif.CanonCs.AESetting 0x0021 Makernote Short 1 0
-Exif.CanonCs.ImageStabilization 0x0022 Makernote Short 1 65535
+Exif.CanonCs.ImageStabilization 0x0022 Makernote Short 1 0
Exif.CanonCs.DisplayAperture 0x0023 Makernote Short 1 49
Exif.CanonCs.ZoomSourceWidth 0x0024 Makernote Short 1 2272
Exif.CanonCs.ZoomTargetWidth 0x0025 Makernote Short 1 2272
@@ -255,6 +255,7 @@ Exif.CanonSi.SubjectDistance 0x0013 Makernote Short 1
Exif.CanonSi.FocusDistanceLower 0x0014 Makernote Short 1 0
Exif.CanonSi.ApertureValue 0x0015 Makernote Short 1 149
Exif.CanonSi.ShutterSpeedValue 0x0016 Makernote Short 1 289
+Exif.CanonSi.MeasuredEV2 0x0017 Makernote Short 1 0
Exif.CanonSi.0x0018 0x0018 Makernote Short 1 0
Exif.CanonSi.0x0019 0x0019 Makernote Short 1 0
Exif.CanonSi.CameraType 0x001a Makernote Short 1 250
@@ -317,7 +318,7 @@ Exif.Photo.MaxApertureValue 0x9205 Exif Rational 1
Exif.Photo.MeteringMode 0x9207 Exif Short 6 1 2 3 4 5 6
Exif.Photo.Flash 0x9209 Exif Short 1 24
Exif.Photo.FocalLength 0x920a Exif Rational 1 682/32
-Exif.Photo.MakerNote 0x927c Exif Undefined 450 12 0 1 0 3 0 40 0 0 0 88 3 0 0 2 0 3 0 4 0 0 0 168 3 0 0 3 0 3 0 4 0 0 0 176 3 0 0 4 0 3 0 27 0 0 0 184 3 0 0 0 0 3 0 6 0 0 0 238 3 0 0 0 0 3 0 4 0 0 0 250 3 0 0 6 0 2 0 32 0 0 0 2 4 0 0 7 0 2 0 24 0 0 0 34 4 0 0 8 0 4 0 1 0 0 0 59 225 17 0 9 0 2 0 32 0 0 0 58 4 0 0 16 0 4 0 1 0 0 0 0 0 17 1 13 0 3 0 21 0 0 0 90 4 0 0 0 0 0 0 80 0 2 0 0 0 5 0 1 0 0 0 0 0 4 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 17 0 5 0 1 0 3 48 1 0 255 255 255 255 170 2 227 0 32 0 149 0 192 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 49 0 224 8 224 8 0 0 1 0 2 0 170 2 30 1 215 0 0 0 0 0 0 0 0 0 54 0 0 0 160 0 20 1 149 0 31 1 0 0 0 0 0 0 0 0 6 0 0 0 0 0 0 0 2 48 0 0 0 0 0 0 1 0 14 3 0 0 149 0 33 1 0 0 0 0 0 0 250 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 73 77 71 58 80 111 119 101 114 83 104 111 116 32 83 52 48 32 74 80 69 71 0 0 0 0 0 0 0 0 0 0 70 105 114 109 119 97 114 101 32 86 101 114 115 105 111 110 32 49 46 49 48 0 0 0 65 110 100 114 101 97 115 32 72 117 103 103 101 108 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 42 0 3 0 1 128 122 1 1 128 0 0 0 0 0 0 3 1 2 0 0 0 10 0 0 0 0 0 0 0 57 0 198 0 5 0 0 0 0 0 0 0
+Exif.Photo.MakerNote 0x927c Exif Undefined 450 12 0 1 0 3 0 40 0 0 0 88 3 0 0 2 0 3 0 4 0 0 0 168 3 0 0 3 0 3 0 4 0 0 0 176 3 0 0 4 0 3 0 27 0 0 0 184 3 0 0 0 0 3 0 6 0 0 0 238 3 0 0 0 0 3 0 4 0 0 0 250 3 0 0 6 0 2 0 32 0 0 0 2 4 0 0 7 0 2 0 24 0 0 0 34 4 0 0 8 0 4 0 1 0 0 0 59 225 17 0 9 0 2 0 32 0 0 0 58 4 0 0 16 0 4 0 1 0 0 0 0 0 17 1 13 0 3 0 21 0 0 0 90 4 0 0 0 0 0 0 80 0 2 0 0 0 5 0 1 0 0 0 0 0 4 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 17 0 5 0 1 0 3 48 1 0 255 255 255 255 170 2 227 0 32 0 149 0 192 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 49 0 224 8 224 8 0 0 1 0 2 0 170 2 30 1 215 0 0 0 0 0 0 0 0 0 54 0 0 0 160 0 20 1 149 0 31 1 0 0 0 0 0 0 0 0 6 0 0 0 0 0 0 0 2 48 0 0 0 0 0 0 1 0 14 3 0 0 149 0 33 1 0 0 0 0 0 0 250 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 73 77 71 58 80 111 119 101 114 83 104 111 116 32 83 52 48 32 74 80 69 71 0 0 0 0 0 0 0 0 0 0 70 105 114 109 119 97 114 101 32 86 101 114 115 105 111 110 32 49 46 49 48 0 0 0 65 110 100 114 101 97 115 32 72 117 103 103 101 108 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 42 0 3 0 1 128 122 1 1 128 0 0 0 0 0 0 3 1 2 0 0 0 10 0 0 0 0 0 0 0 57 0 198 0 5 0 0 0 0 0 0 0
Exif.MakerNote.Offset 0x0001 Makernote Long 1 706
Exif.MakerNote.ByteOrder 0x0002 Makernote Ascii 3 II
Exif.CanonCs.0x0000 0x0000 Makernote Short 1 80
@@ -352,7 +353,7 @@ Exif.CanonCs.0x001e 0x001e Makernote Short 1
Exif.CanonCs.0x001f 0x001f Makernote Short 1 0
Exif.CanonCs.FocusContinuous 0x0020 Makernote Short 1 0
Exif.CanonCs.AESetting 0x0021 Makernote Short 1 0
-Exif.CanonCs.ImageStabilization 0x0022 Makernote Short 1 65535
+Exif.CanonCs.ImageStabilization 0x0022 Makernote Short 1 0
Exif.CanonCs.DisplayAperture 0x0023 Makernote Short 1 49
Exif.CanonCs.ZoomSourceWidth 0x0024 Makernote Short 1 2272
Exif.CanonCs.ZoomTargetWidth 0x0025 Makernote Short 1 2272
@@ -383,6 +384,7 @@ Exif.CanonSi.SubjectDistance 0x0013 Makernote Short 1
Exif.CanonSi.FocusDistanceLower 0x0014 Makernote Short 1 0
Exif.CanonSi.ApertureValue 0x0015 Makernote Short 1 149
Exif.CanonSi.ShutterSpeedValue 0x0016 Makernote Short 1 289
+Exif.CanonSi.MeasuredEV2 0x0017 Makernote Short 1 0
Exif.CanonSi.0x0018 0x0018 Makernote Short 1 0
Exif.CanonSi.0x0019 0x0019 Makernote Short 1 0
Exif.CanonSi.CameraType 0x001a Makernote Short 1 250
@@ -446,7 +448,7 @@ Exif.Photo.MaxApertureValue 0x9205 Exif Rational 1
Exif.Photo.MeteringMode 0x9207 Exif Short 1 1
Exif.Photo.Flash 0x9209 Exif Short 1 24
Exif.Photo.FocalLength 0x920a Exif Rational 1 682/32
-Exif.Photo.MakerNote 0x927c Exif Undefined 450 12 0 1 0 3 0 40 0 0 0 36 3 0 0 2 0 3 0 4 0 0 0 116 3 0 0 3 0 3 0 4 0 0 0 124 3 0 0 4 0 3 0 27 0 0 0 132 3 0 0 0 0 3 0 6 0 0 0 186 3 0 0 0 0 3 0 4 0 0 0 198 3 0 0 6 0 2 0 32 0 0 0 206 3 0 0 7 0 2 0 24 0 0 0 238 3 0 0 8 0 4 0 1 0 0 0 59 225 17 0 9 0 2 0 32 0 0 0 6 4 0 0 16 0 4 0 1 0 0 0 0 0 17 1 13 0 3 0 21 0 0 0 38 4 0 0 0 0 0 0 80 0 2 0 0 0 5 0 1 0 0 0 0 0 4 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 17 0 5 0 1 0 3 48 1 0 255 255 255 255 170 2 227 0 32 0 149 0 192 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 49 0 224 8 224 8 0 0 1 0 2 0 170 2 30 1 215 0 0 0 0 0 0 0 0 0 54 0 0 0 160 0 20 1 149 0 31 1 0 0 0 0 0 0 0 0 6 0 0 0 0 0 0 0 2 48 0 0 0 0 0 0 1 0 14 3 0 0 149 0 33 1 0 0 0 0 0 0 250 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 73 77 71 58 80 111 119 101 114 83 104 111 116 32 83 52 48 32 74 80 69 71 0 0 0 0 0 0 0 0 0 0 70 105 114 109 119 97 114 101 32 86 101 114 115 105 111 110 32 49 46 49 48 0 0 0 65 110 100 114 101 97 115 32 72 117 103 103 101 108 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 42 0 3 0 1 128 122 1 1 128 0 0 0 0 0 0 3 1 2 0 0 0 10 0 0 0 0 0 0 0 57 0 198 0 5 0 0 0 0 0 0 0
+Exif.Photo.MakerNote 0x927c Exif Undefined 450 12 0 1 0 3 0 40 0 0 0 36 3 0 0 2 0 3 0 4 0 0 0 116 3 0 0 3 0 3 0 4 0 0 0 124 3 0 0 4 0 3 0 27 0 0 0 132 3 0 0 0 0 3 0 6 0 0 0 186 3 0 0 0 0 3 0 4 0 0 0 198 3 0 0 6 0 2 0 32 0 0 0 206 3 0 0 7 0 2 0 24 0 0 0 238 3 0 0 8 0 4 0 1 0 0 0 59 225 17 0 9 0 2 0 32 0 0 0 6 4 0 0 16 0 4 0 1 0 0 0 0 0 17 1 13 0 3 0 21 0 0 0 38 4 0 0 0 0 0 0 80 0 2 0 0 0 5 0 1 0 0 0 0 0 4 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 17 0 5 0 1 0 3 48 1 0 255 255 255 255 170 2 227 0 32 0 149 0 192 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 49 0 224 8 224 8 0 0 1 0 2 0 170 2 30 1 215 0 0 0 0 0 0 0 0 0 54 0 0 0 160 0 20 1 149 0 31 1 0 0 0 0 0 0 0 0 6 0 0 0 0 0 0 0 2 48 0 0 0 0 0 0 1 0 14 3 0 0 149 0 33 1 0 0 0 0 0 0 250 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 73 77 71 58 80 111 119 101 114 83 104 111 116 32 83 52 48 32 74 80 69 71 0 0 0 0 0 0 0 0 0 0 70 105 114 109 119 97 114 101 32 86 101 114 115 105 111 110 32 49 46 49 48 0 0 0 65 110 100 114 101 97 115 32 72 117 103 103 101 108 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 42 0 3 0 1 128 122 1 1 128 0 0 0 0 0 0 3 1 2 0 0 0 10 0 0 0 0 0 0 0 57 0 198 0 5 0 0 0 0 0 0 0
Exif.MakerNote.Offset 0x0001 Makernote Long 1 654
Exif.MakerNote.ByteOrder 0x0002 Makernote Ascii 3 II
Exif.CanonCs.0x0000 0x0000 Makernote Short 1 80
@@ -481,7 +483,7 @@ Exif.CanonCs.0x001e 0x001e Makernote Short 1
Exif.CanonCs.0x001f 0x001f Makernote Short 1 0
Exif.CanonCs.FocusContinuous 0x0020 Makernote Short 1 0
Exif.CanonCs.AESetting 0x0021 Makernote Short 1 0
-Exif.CanonCs.ImageStabilization 0x0022 Makernote Short 1 65535
+Exif.CanonCs.ImageStabilization 0x0022 Makernote Short 1 0
Exif.CanonCs.DisplayAperture 0x0023 Makernote Short 1 49
Exif.CanonCs.ZoomSourceWidth 0x0024 Makernote Short 1 2272
Exif.CanonCs.ZoomTargetWidth 0x0025 Makernote Short 1 2272
@@ -512,6 +514,7 @@ Exif.CanonSi.SubjectDistance 0x0013 Makernote Short 1
Exif.CanonSi.FocusDistanceLower 0x0014 Makernote Short 1 0
Exif.CanonSi.ApertureValue 0x0015 Makernote Short 1 149
Exif.CanonSi.ShutterSpeedValue 0x0016 Makernote Short 1 289
+Exif.CanonSi.MeasuredEV2 0x0017 Makernote Short 1 0
Exif.CanonSi.0x0018 0x0018 Makernote Short 1 0
Exif.CanonSi.0x0019 0x0019 Makernote Short 1 0
Exif.CanonSi.CameraType 0x001a Makernote Short 1 250
@@ -575,7 +578,7 @@ Exif.Photo.MaxApertureValue 0x9205 Exif Rational 1
Exif.Photo.MeteringMode 0x9207 Exif Short 1 1
Exif.Photo.Flash 0x9209 Exif Short 1 24
Exif.Photo.FocalLength 0x920a Exif Rational 1 682/32
-Exif.Photo.MakerNote 0x927c Exif Undefined 450 12 0 1 0 3 0 40 0 0 0 76 3 0 0 2 0 3 0 4 0 0 0 156 3 0 0 3 0 3 0 4 0 0 0 164 3 0 0 4 0 3 0 27 0 0 0 172 3 0 0 0 0 3 0 6 0 0 0 226 3 0 0 0 0 3 0 4 0 0 0 238 3 0 0 6 0 2 0 32 0 0 0 246 3 0 0 7 0 2 0 24 0 0 0 22 4 0 0 8 0 4 0 1 0 0 0 59 225 17 0 9 0 2 0 32 0 0 0 46 4 0 0 16 0 4 0 1 0 0 0 0 0 17 1 13 0 3 0 21 0 0 0 78 4 0 0 0 0 0 0 80 0 2 0 0 0 5 0 1 0 0 0 0 0 4 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 17 0 5 0 1 0 3 48 1 0 255 255 255 255 170 2 227 0 32 0 149 0 192 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 49 0 224 8 224 8 0 0 1 0 2 0 170 2 30 1 215 0 0 0 0 0 0 0 0 0 54 0 0 0 160 0 20 1 149 0 31 1 0 0 0 0 0 0 0 0 6 0 0 0 0 0 0 0 2 48 0 0 0 0 0 0 1 0 14 3 0 0 149 0 33 1 0 0 0 0 0 0 250 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 73 77 71 58 80 111 119 101 114 83 104 111 116 32 83 52 48 32 74 80 69 71 0 0 0 0 0 0 0 0 0 0 70 105 114 109 119 97 114 101 32 86 101 114 115 105 111 110 32 49 46 49 48 0 0 0 65 110 100 114 101 97 115 32 72 117 103 103 101 108 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 42 0 3 0 1 128 122 1 1 128 0 0 0 0 0 0 3 1 2 0 0 0 10 0 0 0 0 0 0 0 57 0 198 0 5 0 0 0 0 0 0 0
+Exif.Photo.MakerNote 0x927c Exif Undefined 450 12 0 1 0 3 0 40 0 0 0 76 3 0 0 2 0 3 0 4 0 0 0 156 3 0 0 3 0 3 0 4 0 0 0 164 3 0 0 4 0 3 0 27 0 0 0 172 3 0 0 0 0 3 0 6 0 0 0 226 3 0 0 0 0 3 0 4 0 0 0 238 3 0 0 6 0 2 0 32 0 0 0 246 3 0 0 7 0 2 0 24 0 0 0 22 4 0 0 8 0 4 0 1 0 0 0 59 225 17 0 9 0 2 0 32 0 0 0 46 4 0 0 16 0 4 0 1 0 0 0 0 0 17 1 13 0 3 0 21 0 0 0 78 4 0 0 0 0 0 0 80 0 2 0 0 0 5 0 1 0 0 0 0 0 4 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 17 0 5 0 1 0 3 48 1 0 255 255 255 255 170 2 227 0 32 0 149 0 192 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 49 0 224 8 224 8 0 0 1 0 2 0 170 2 30 1 215 0 0 0 0 0 0 0 0 0 54 0 0 0 160 0 20 1 149 0 31 1 0 0 0 0 0 0 0 0 6 0 0 0 0 0 0 0 2 48 0 0 0 0 0 0 1 0 14 3 0 0 149 0 33 1 0 0 0 0 0 0 250 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 73 77 71 58 80 111 119 101 114 83 104 111 116 32 83 52 48 32 74 80 69 71 0 0 0 0 0 0 0 0 0 0 70 105 114 109 119 97 114 101 32 86 101 114 115 105 111 110 32 49 46 49 48 0 0 0 65 110 100 114 101 97 115 32 72 117 103 103 101 108 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 42 0 3 0 1 128 122 1 1 128 0 0 0 0 0 0 3 1 2 0 0 0 10 0 0 0 0 0 0 0 57 0 198 0 5 0 0 0 0 0 0 0
Exif.MakerNote.Offset 0x0001 Makernote Long 1 694
Exif.MakerNote.ByteOrder 0x0002 Makernote Ascii 3 II
Exif.CanonCs.0x0000 0x0000 Makernote Short 1 80
@@ -610,7 +613,7 @@ Exif.CanonCs.0x001e 0x001e Makernote Short 1
Exif.CanonCs.0x001f 0x001f Makernote Short 1 0
Exif.CanonCs.FocusContinuous 0x0020 Makernote Short 1 0
Exif.CanonCs.AESetting 0x0021 Makernote Short 1 0
-Exif.CanonCs.ImageStabilization 0x0022 Makernote Short 1 65535
+Exif.CanonCs.ImageStabilization 0x0022 Makernote Short 1 0
Exif.CanonCs.DisplayAperture 0x0023 Makernote Short 1 49
Exif.CanonCs.ZoomSourceWidth 0x0024 Makernote Short 1 2272
Exif.CanonCs.ZoomTargetWidth 0x0025 Makernote Short 1 2272
@@ -641,6 +644,7 @@ Exif.CanonSi.SubjectDistance 0x0013 Makernote Short 1
Exif.CanonSi.FocusDistanceLower 0x0014 Makernote Short 1 0
Exif.CanonSi.ApertureValue 0x0015 Makernote Short 1 149
Exif.CanonSi.ShutterSpeedValue 0x0016 Makernote Short 1 289
+Exif.CanonSi.MeasuredEV2 0x0017 Makernote Short 1 0
Exif.CanonSi.0x0018 0x0018 Makernote Short 1 0
Exif.CanonSi.0x0019 0x0019 Makernote Short 1 0
Exif.CanonSi.CameraType 0x001a Makernote Short 1 250
diff --git a/test/exifdata-test.sh b/test/exifdata-test.sh
index a99b3ad..2bbe001 100755
--- a/test/exifdata-test.sh
+++ b/test/exifdata-test.sh
@@ -1,11 +1,13 @@
#!/bin/bash
-# Test driver for exifdata copy construction and assignment unit tests
+# Test driver for exifdata copy construction and assignment unit tests
source ./functions.source
( cd "$testdir"
copyTestFiles exiv2-gc.jpg exiv2-canon-powershot-s40.jpg exiv2-nikon-d70.jpg
+ runTest exiv2 -dc exiv2-gc.jpg exiv2-canon-powershot-s40.jpg exiv2-nikon-d70.jpg
+
runTest exifdata-test exiv2-gc.jpg
runTest exifdata-test exiv2-canon-powershot-s40.jpg
runTest exifdata-test exiv2-nikon-d70.jpg
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list