third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Canon Camera Settings update (David Cannings)

Browse Source
This commit is contained in:
Andreas Huggel
2006-08-30 16:57:39 +00:00
parent e3740e7246
commit cb8cb3cdfd
5 changed files with 199 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/canonmn.cpp
+44 -8
View File
@@ -216,7 +216,8 @@ namespace Exiv2 {
{ 16, "50" },
{ 17, "100" },
{ 18, "200" },
{ 19, "400" }
{ 19, "400" },
{ 20, "800" }
};
//! MeteringMode, tag 0x0011
@@ -291,6 +292,34 @@ namespace Exiv2 {
{ 1, "Continuous" }
};
//! AESetting, tag 0x0021
extern const TagDetails canonCsAESetting[] = {
{ 0, "Normal AE" },
{ 1, "Exposure compensation" },
{ 2, "AE lock" },
{ 3, "AE lock + exposure compensation" },
{ 4, "No AE" }
};
//! ImageStabilization, tag 0x0022
extern const TagDetails canonCsImageStabilization[] = {
{ 0, "Off" },
{ 1, "On" },
{ 2, "On, shot only" }
};
//! PhotoEffect, tag 0x0028
extern const TagDetails canonCsPhotoEffect[] = {
{ 0, "Off" },
{ 1, "Vivid" },
{ 2, "Neutral" },
{ 3, "Smooth" },
{ 4, "Sepia" },
{ 5, "B&W" },
{ 6, "Custom" },
{ 100, "My color data" }
};
// Canon Camera Settings Tag Info
const TagInfo CanonMakerNote::tagInfoCs_[] = {
TagInfo(0x0001, "Macro", "Macro", "Macro mode", canonCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCsMacro)),
@@ -325,13 +354,16 @@ namespace Exiv2 {
TagInfo(0x001e, "0x001e", "0x001e", "Unknown", canonCsIfdId, makerTags, unsignedShort, printValue),
TagInfo(0x001f, "0x001f", "0x001f", "Unknown", canonCsIfdId, makerTags, unsignedShort, printValue),
TagInfo(0x0020, "FocusContinuous", "Focus Continuous", "Focus continuous setting", canonCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCsFocusContinuous)),
TagInfo(0x0021, "0x0021", "0x0021", "Unknown", canonCsIfdId, makerTags, unsignedShort, printValue),
TagInfo(0x0022, "0x0022", "0x0022", "Unknown", canonCsIfdId, makerTags, unsignedShort, printValue),
TagInfo(0x0023, "0x0023", "0x0023", "Unknown", canonCsIfdId, makerTags, unsignedShort, printValue),
TagInfo(0x0024, "0x0024", "0x0024", "Unknown", canonCsIfdId, makerTags, unsignedShort, printValue),
TagInfo(0x0025, "0x0025", "0x0025", "Unknown", canonCsIfdId, makerTags, unsignedShort, printValue),
TagInfo(0x0021, "AESetting", "AESetting", "AE setting", canonCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCsAESetting)),
TagInfo(0x0022, "ImageStabilization", "ImageStabilization", "Image stabilization", canonCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCsImageStabilization)),
TagInfo(0x0023, "DisplayAperture", "DisplayAperture", "Display aperture", canonCsIfdId, makerTags, unsignedShort, printValue),
TagInfo(0x0024, "ZoomSourceWidth", "ZoomSourceWidth", "Zoom source width", canonCsIfdId, makerTags, unsignedShort, printValue),
TagInfo(0x0025, "ZoomTargetWidth", "ZoomTargetWidth", "Zoom target width", canonCsIfdId, makerTags, unsignedShort, printValue),
TagInfo(0x0026, "0x0026", "0x0026", "Unknown", canonCsIfdId, makerTags, unsignedShort, printValue),
TagInfo(0x0027, "0x0027", "0x0027", "Unknown", canonCsIfdId, makerTags, unsignedShort, printValue),
TagInfo(0x0028, "PhotoEffect", "PhotoEffect", "Photo effect", canonCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCsPhotoEffect)),
TagInfo(0x0029, "0x0029", "0x0029", "Unknown", canonCsIfdId, makerTags, unsignedShort, printValue),
TagInfo(0x002a, "ColorTone", "ColorTone", "Color tone", canonCsIfdId, makerTags, unsignedShort, printValue),
// End of list marker
TagInfo(0xffff, "(UnknownCanonCsTag)", "(UnknownCanonCsTag)", "Unknown Canon Camera Settings 1 tag", canonCsIfdId, makerTags, invalidTypeId, printValue)
};
@@ -824,8 +856,12 @@ namespace Exiv2 {
float len2 = value.toLong(1) / fu;
std::ostringstream oss;
oss.copyfmt(os);
os << std::fixed << std::setprecision(1)
<< len2 << " - " << len1 << " mm";
os << std::fixed << std::setprecision(1);
if (len1 == len2) {
os << len1 << " mm";
} else {
os << len2 << " - " << len1 << " mm";
}
os.copyfmt(oss);
return os;
}
test/data/bugfixes-test.out
+5 -5
View File
@@ -158,11 +158,11 @@ Exif.CanonCs.FlashDetails Short 1
Exif.CanonCs.0x001e Short 1 0
Exif.CanonCs.0x001f Short 1 0
Exif.CanonCs.FocusContinuous Short 1 Single
Exif.CanonCs.0x0021 Short 1 0
Exif.CanonCs.0x0022 Short 1 65535
Exif.CanonCs.0x0023 Short 1 49
Exif.CanonCs.0x0024 Short 1 2272
Exif.CanonCs.0x0025 Short 1 2272
Exif.CanonCs.AESetting Short 1 Normal AE
Exif.CanonCs.ImageStabilization Short 1 (65535)
Exif.CanonCs.DisplayAperture Short 1 49
Exif.CanonCs.ZoomSourceWidth Short 1 2272
Exif.CanonCs.ZoomTargetWidth Short 1 2272
Exif.CanonCs.0x0026 Short 1 0
Exif.CanonCs.0x0027 Short 1 1
Exif.CanonSi.0x0001 Short 1 0
test/data/crw-test.out
BIN
View File
Binary file not shown.
test/data/exifdata-test.out
+20 -20
View File
@@ -245,11 +245,11 @@ Exif.CanonCs.FlashDetails 0x001d Makernote Short 1
Exif.CanonCs.0x001e 0x001e Makernote Short 1 0
Exif.CanonCs.0x001f 0x001f Makernote Short 1 0
Exif.CanonCs.FocusContinuous 0x0020 Makernote Short 1 0
Exif.CanonCs.0x0021 0x0021 Makernote Short 1 0
Exif.CanonCs.0x0022 0x0022 Makernote Short 1 65535
Exif.CanonCs.0x0023 0x0023 Makernote Short 1 49
Exif.CanonCs.0x0024 0x0024 Makernote Short 1 2272
Exif.CanonCs.0x0025 0x0025 Makernote Short 1 2272
Exif.CanonCs.AESetting 0x0021 Makernote Short 1 0
Exif.CanonCs.ImageStabilization 0x0022 Makernote Short 1 65535
Exif.CanonCs.DisplayAperture 0x0023 Makernote Short 1 49
Exif.CanonCs.ZoomSourceWidth 0x0024 Makernote Short 1 2272
Exif.CanonCs.ZoomTargetWidth 0x0025 Makernote Short 1 2272
Exif.CanonCs.0x0026 0x0026 Makernote Short 1 0
Exif.CanonCs.0x0027 0x0027 Makernote Short 1 1
Exif.CanonSi.0x0001 0x0001 Makernote Short 1 0
@@ -369,11 +369,11 @@ Exif.CanonCs.FlashDetails 0x001d Makernote Short 1
Exif.CanonCs.0x001e 0x001e Makernote Short 1 0
Exif.CanonCs.0x001f 0x001f Makernote Short 1 0
Exif.CanonCs.FocusContinuous 0x0020 Makernote Short 1 0
Exif.CanonCs.0x0021 0x0021 Makernote Short 1 0
Exif.CanonCs.0x0022 0x0022 Makernote Short 1 65535
Exif.CanonCs.0x0023 0x0023 Makernote Short 1 49
Exif.CanonCs.0x0024 0x0024 Makernote Short 1 2272
Exif.CanonCs.0x0025 0x0025 Makernote Short 1 2272
Exif.CanonCs.AESetting 0x0021 Makernote Short 1 0
Exif.CanonCs.ImageStabilization 0x0022 Makernote Short 1 65535
Exif.CanonCs.DisplayAperture 0x0023 Makernote Short 1 49
Exif.CanonCs.ZoomSourceWidth 0x0024 Makernote Short 1 2272
Exif.CanonCs.ZoomTargetWidth 0x0025 Makernote Short 1 2272
Exif.CanonCs.0x0026 0x0026 Makernote Short 1 0
Exif.CanonCs.0x0027 0x0027 Makernote Short 1 1
Exif.CanonSi.0x0001 0x0001 Makernote Short 1 0
@@ -494,11 +494,11 @@ Exif.CanonCs.FlashDetails 0x001d Makernote Short 1
Exif.CanonCs.0x001e 0x001e Makernote Short 1 0
Exif.CanonCs.0x001f 0x001f Makernote Short 1 0
Exif.CanonCs.FocusContinuous 0x0020 Makernote Short 1 0
Exif.CanonCs.0x0021 0x0021 Makernote Short 1 0
Exif.CanonCs.0x0022 0x0022 Makernote Short 1 65535
Exif.CanonCs.0x0023 0x0023 Makernote Short 1 49
Exif.CanonCs.0x0024 0x0024 Makernote Short 1 2272
Exif.CanonCs.0x0025 0x0025 Makernote Short 1 2272
Exif.CanonCs.AESetting 0x0021 Makernote Short 1 0
Exif.CanonCs.ImageStabilization 0x0022 Makernote Short 1 65535
Exif.CanonCs.DisplayAperture 0x0023 Makernote Short 1 49
Exif.CanonCs.ZoomSourceWidth 0x0024 Makernote Short 1 2272
Exif.CanonCs.ZoomTargetWidth 0x0025 Makernote Short 1 2272
Exif.CanonCs.0x0026 0x0026 Makernote Short 1 0
Exif.CanonCs.0x0027 0x0027 Makernote Short 1 1
Exif.CanonSi.0x0001 0x0001 Makernote Short 1 0
@@ -618,11 +618,11 @@ Exif.CanonCs.FlashDetails 0x001d Makernote Short 1
Exif.CanonCs.0x001e 0x001e Makernote Short 1 0
Exif.CanonCs.0x001f 0x001f Makernote Short 1 0
Exif.CanonCs.FocusContinuous 0x0020 Makernote Short 1 0
Exif.CanonCs.0x0021 0x0021 Makernote Short 1 0
Exif.CanonCs.0x0022 0x0022 Makernote Short 1 65535
Exif.CanonCs.0x0023 0x0023 Makernote Short 1 49
Exif.CanonCs.0x0024 0x0024 Makernote Short 1 2272
Exif.CanonCs.0x0025 0x0025 Makernote Short 1 2272
Exif.CanonCs.AESetting 0x0021 Makernote Short 1 0
Exif.CanonCs.ImageStabilization 0x0022 Makernote Short 1 65535
Exif.CanonCs.DisplayAperture 0x0023 Makernote Short 1 49
Exif.CanonCs.ZoomSourceWidth 0x0024 Makernote Short 1 2272
Exif.CanonCs.ZoomTargetWidth 0x0025 Makernote Short 1 2272
Exif.CanonCs.0x0026 0x0026 Makernote Short 1 0
Exif.CanonCs.0x0027 0x0027 Makernote Short 1 1
Exif.CanonSi.0x0001 0x0001 Makernote Short 1 0
test/data/exiv2-test.out
+130 -130
View File
@@ -626,11 +626,11 @@ File 2/15: 20031214_000043.jpg
20031214_000043.jpg Exif.CanonCs.0x001e Short 1 0
20031214_000043.jpg Exif.CanonCs.0x001f Short 1 0
20031214_000043.jpg Exif.CanonCs.FocusContinuous Short 1 Single
20031214_000043.jpg Exif.CanonCs.0x0021 Short 1 0
20031214_000043.jpg Exif.CanonCs.0x0022 Short 1 65535
20031214_000043.jpg Exif.CanonCs.0x0023 Short 1 49
20031214_000043.jpg Exif.CanonCs.0x0024 Short 1 2272
20031214_000043.jpg Exif.CanonCs.0x0025 Short 1 2272
20031214_000043.jpg Exif.CanonCs.AESetting Short 1 Normal AE
20031214_000043.jpg Exif.CanonCs.ImageStabilization Short 1 (65535)
20031214_000043.jpg Exif.CanonCs.DisplayAperture Short 1 49
20031214_000043.jpg Exif.CanonCs.ZoomSourceWidth Short 1 2272
20031214_000043.jpg Exif.CanonCs.ZoomTargetWidth Short 1 2272
20031214_000043.jpg Exif.CanonCs.0x0026 Short 1 0
20031214_000043.jpg Exif.CanonCs.0x0027 Short 1 1
20031214_000043.jpg Exif.CanonSi.0x0001 Short 1 0
@@ -979,16 +979,16 @@ File 6/15: 20030925_201850.jpg
20030925_201850.jpg Exif.CanonCs.0x001e Short 1 0
20030925_201850.jpg Exif.CanonCs.0x001f Short 1 0
20030925_201850.jpg Exif.CanonCs.FocusContinuous Short 1 (65535)
20030925_201850.jpg Exif.CanonCs.0x0021 Short 1 65535
20030925_201850.jpg Exif.CanonCs.0x0022 Short 1 65535
20030925_201850.jpg Exif.CanonCs.0x0023 Short 1 0
20030925_201850.jpg Exif.CanonCs.0x0024 Short 1 3072
20030925_201850.jpg Exif.CanonCs.0x0025 Short 1 3072
20030925_201850.jpg Exif.CanonCs.AESetting Short 1 (65535)
20030925_201850.jpg Exif.CanonCs.ImageStabilization Short 1 (65535)
20030925_201850.jpg Exif.CanonCs.DisplayAperture Short 1 0
20030925_201850.jpg Exif.CanonCs.ZoomSourceWidth Short 1 3072
20030925_201850.jpg Exif.CanonCs.ZoomTargetWidth Short 1 3072
20030925_201850.jpg Exif.CanonCs.0x0026 Short 1 0
20030925_201850.jpg Exif.CanonCs.0x0027 Short 1 65535
20030925_201850.jpg Exif.CanonCs.0x0028 Short 1 65535
20030925_201850.jpg Exif.CanonCs.PhotoEffect Short 1 (65535)
20030925_201850.jpg Exif.CanonCs.0x0029 Short 1 0
20030925_201850.jpg Exif.CanonCs.0x002a Short 1 0
20030925_201850.jpg Exif.CanonCs.ColorTone Short 1 0
20030925_201850.jpg Exif.CanonCs.0x002b Short 1 32767
20030925_201850.jpg Exif.CanonCs.0x002c Short 1 65535
20030925_201850.jpg Exif.CanonCs.0x002d Short 1 65535
@@ -1539,16 +1539,16 @@ Warning: Makernote: Pointer to next IFD is out of bounds; ignored.
20060802_095200.jpg Exif.CanonCs.0x001e Short 1 0
20060802_095200.jpg Exif.CanonCs.0x001f Short 1 0
20060802_095200.jpg Exif.CanonCs.FocusContinuous Short 1 Single
20060802_095200.jpg Exif.CanonCs.0x0021 Short 1 65535
20060802_095200.jpg Exif.CanonCs.0x0022 Short 1 65535
20060802_095200.jpg Exif.CanonCs.0x0023 Short 1 0
20060802_095200.jpg Exif.CanonCs.0x0024 Short 1 0
20060802_095200.jpg Exif.CanonCs.0x0025 Short 1 0
20060802_095200.jpg Exif.CanonCs.AESetting Short 1 (65535)
20060802_095200.jpg Exif.CanonCs.ImageStabilization Short 1 (65535)
20060802_095200.jpg Exif.CanonCs.DisplayAperture Short 1 0
20060802_095200.jpg Exif.CanonCs.ZoomSourceWidth Short 1 0
20060802_095200.jpg Exif.CanonCs.ZoomTargetWidth Short 1 0
20060802_095200.jpg Exif.CanonCs.0x0026 Short 1 0
20060802_095200.jpg Exif.CanonCs.0x0027 Short 1 65535
20060802_095200.jpg Exif.CanonCs.0x0028 Short 1 0
20060802_095200.jpg Exif.CanonCs.PhotoEffect Short 1 Off
20060802_095200.jpg Exif.CanonCs.0x0029 Short 1 32767
20060802_095200.jpg Exif.CanonCs.0x002a Short 1 0
20060802_095200.jpg Exif.CanonCs.ColorTone Short 1 0
20060802_095200.jpg Exif.CanonCs.0x002b Short 1 32767
20060802_095200.jpg Exif.CanonCs.0x002c Short 1 65535
20060802_095200.jpg Exif.CanonCs.0x002d Short 1 65535
@@ -1846,16 +1846,16 @@ File 15/15: 20060127_225027.jpg
20060127_225027.jpg Exif.CanonCs.0x001e Short 1 0
20060127_225027.jpg Exif.CanonCs.0x001f Short 1 0
20060127_225027.jpg Exif.CanonCs.FocusContinuous Short 1 Single
20060127_225027.jpg Exif.CanonCs.0x0021 Short 1 0
20060127_225027.jpg Exif.CanonCs.0x0022 Short 1 65535
20060127_225027.jpg Exif.CanonCs.0x0023 Short 1 0
20060127_225027.jpg Exif.CanonCs.0x0024 Short 1 2272
20060127_225027.jpg Exif.CanonCs.0x0025 Short 1 2272
20060127_225027.jpg Exif.CanonCs.AESetting Short 1 Normal AE
20060127_225027.jpg Exif.CanonCs.ImageStabilization Short 1 (65535)
20060127_225027.jpg Exif.CanonCs.DisplayAperture Short 1 0
20060127_225027.jpg Exif.CanonCs.ZoomSourceWidth Short 1 2272
20060127_225027.jpg Exif.CanonCs.ZoomTargetWidth Short 1 2272
20060127_225027.jpg Exif.CanonCs.0x0026 Short 1 0
20060127_225027.jpg Exif.CanonCs.0x0027 Short 1 0
20060127_225027.jpg Exif.CanonCs.0x0028 Short 1 0
20060127_225027.jpg Exif.CanonCs.PhotoEffect Short 1 Off
20060127_225027.jpg Exif.CanonCs.0x0029 Short 1 0
20060127_225027.jpg Exif.CanonCs.0x002a Short 1 32767
20060127_225027.jpg Exif.CanonCs.ColorTone Short 1 32767
20060127_225027.jpg Exif.CanonCs.0x002b Short 1 32767
20060127_225027.jpg Exif.CanonCs.0x002c Short 1 0
20060127_225027.jpg Exif.CanonCs.0x002d Short 1 0
@@ -2088,11 +2088,11 @@ Compare image data and extracted data ------------------------------------
< 20031214_000043.jpg Exif.CanonCs.0x001e Short 1 0
< 20031214_000043.jpg Exif.CanonCs.0x001f Short 1 0
< 20031214_000043.jpg Exif.CanonCs.FocusContinuous Short 1 Single
< 20031214_000043.jpg Exif.CanonCs.0x0021 Short 1 0
< 20031214_000043.jpg Exif.CanonCs.0x0022 Short 1 65535
< 20031214_000043.jpg Exif.CanonCs.0x0023 Short 1 49
< 20031214_000043.jpg Exif.CanonCs.0x0024 Short 1 2272
< 20031214_000043.jpg Exif.CanonCs.0x0025 Short 1 2272
< 20031214_000043.jpg Exif.CanonCs.AESetting Short 1 Normal AE
< 20031214_000043.jpg Exif.CanonCs.ImageStabilization Short 1 (65535)
< 20031214_000043.jpg Exif.CanonCs.DisplayAperture Short 1 49
< 20031214_000043.jpg Exif.CanonCs.ZoomSourceWidth Short 1 2272
< 20031214_000043.jpg Exif.CanonCs.ZoomTargetWidth Short 1 2272
< 20031214_000043.jpg Exif.CanonCs.0x0026 Short 1 0
< 20031214_000043.jpg Exif.CanonCs.0x0027 Short 1 1
< 20031214_000043.jpg Exif.CanonSi.0x0001 Short 1 0
@@ -2441,16 +2441,16 @@ Compare image data and extracted data ------------------------------------
< 20030925_201850.jpg Exif.CanonCs.0x001e Short 1 0
< 20030925_201850.jpg Exif.CanonCs.0x001f Short 1 0
< 20030925_201850.jpg Exif.CanonCs.FocusContinuous Short 1 (65535)
< 20030925_201850.jpg Exif.CanonCs.0x0021 Short 1 65535
< 20030925_201850.jpg Exif.CanonCs.0x0022 Short 1 65535
< 20030925_201850.jpg Exif.CanonCs.0x0023 Short 1 0
< 20030925_201850.jpg Exif.CanonCs.0x0024 Short 1 3072
< 20030925_201850.jpg Exif.CanonCs.0x0025 Short 1 3072
< 20030925_201850.jpg Exif.CanonCs.AESetting Short 1 (65535)
< 20030925_201850.jpg Exif.CanonCs.ImageStabilization Short 1 (65535)
< 20030925_201850.jpg Exif.CanonCs.DisplayAperture Short 1 0
< 20030925_201850.jpg Exif.CanonCs.ZoomSourceWidth Short 1 3072
< 20030925_201850.jpg Exif.CanonCs.ZoomTargetWidth Short 1 3072
< 20030925_201850.jpg Exif.CanonCs.0x0026 Short 1 0
< 20030925_201850.jpg Exif.CanonCs.0x0027 Short 1 65535
< 20030925_201850.jpg Exif.CanonCs.0x0028 Short 1 65535
< 20030925_201850.jpg Exif.CanonCs.PhotoEffect Short 1 (65535)
< 20030925_201850.jpg Exif.CanonCs.0x0029 Short 1 0
< 20030925_201850.jpg Exif.CanonCs.0x002a Short 1 0
< 20030925_201850.jpg Exif.CanonCs.ColorTone Short 1 0
< 20030925_201850.jpg Exif.CanonCs.0x002b Short 1 32767
< 20030925_201850.jpg Exif.CanonCs.0x002c Short 1 65535
< 20030925_201850.jpg Exif.CanonCs.0x002d Short 1 65535
@@ -3000,16 +3000,16 @@ Compare image data and extracted data ------------------------------------
< 20060802_095200.jpg Exif.CanonCs.0x001e Short 1 0
< 20060802_095200.jpg Exif.CanonCs.0x001f Short 1 0
< 20060802_095200.jpg Exif.CanonCs.FocusContinuous Short 1 Single
< 20060802_095200.jpg Exif.CanonCs.0x0021 Short 1 65535
< 20060802_095200.jpg Exif.CanonCs.0x0022 Short 1 65535
< 20060802_095200.jpg Exif.CanonCs.0x0023 Short 1 0
< 20060802_095200.jpg Exif.CanonCs.0x0024 Short 1 0
< 20060802_095200.jpg Exif.CanonCs.0x0025 Short 1 0
< 20060802_095200.jpg Exif.CanonCs.AESetting Short 1 (65535)
< 20060802_095200.jpg Exif.CanonCs.ImageStabilization Short 1 (65535)
< 20060802_095200.jpg Exif.CanonCs.DisplayAperture Short 1 0
< 20060802_095200.jpg Exif.CanonCs.ZoomSourceWidth Short 1 0
< 20060802_095200.jpg Exif.CanonCs.ZoomTargetWidth Short 1 0
< 20060802_095200.jpg Exif.CanonCs.0x0026 Short 1 0
< 20060802_095200.jpg Exif.CanonCs.0x0027 Short 1 65535
< 20060802_095200.jpg Exif.CanonCs.0x0028 Short 1 0
< 20060802_095200.jpg Exif.CanonCs.PhotoEffect Short 1 Off
< 20060802_095200.jpg Exif.CanonCs.0x0029 Short 1 32767
< 20060802_095200.jpg Exif.CanonCs.0x002a Short 1 0
< 20060802_095200.jpg Exif.CanonCs.ColorTone Short 1 0
< 20060802_095200.jpg Exif.CanonCs.0x002b Short 1 32767
< 20060802_095200.jpg Exif.CanonCs.0x002c Short 1 65535
< 20060802_095200.jpg Exif.CanonCs.0x002d Short 1 65535
@@ -3307,16 +3307,16 @@ Compare image data and extracted data ------------------------------------
< 20060127_225027.jpg Exif.CanonCs.0x001e Short 1 0
< 20060127_225027.jpg Exif.CanonCs.0x001f Short 1 0
< 20060127_225027.jpg Exif.CanonCs.FocusContinuous Short 1 Single
< 20060127_225027.jpg Exif.CanonCs.0x0021 Short 1 0
< 20060127_225027.jpg Exif.CanonCs.0x0022 Short 1 65535
< 20060127_225027.jpg Exif.CanonCs.0x0023 Short 1 0
< 20060127_225027.jpg Exif.CanonCs.0x0024 Short 1 2272
< 20060127_225027.jpg Exif.CanonCs.0x0025 Short 1 2272
< 20060127_225027.jpg Exif.CanonCs.AESetting Short 1 Normal AE
< 20060127_225027.jpg Exif.CanonCs.ImageStabilization Short 1 (65535)
< 20060127_225027.jpg Exif.CanonCs.DisplayAperture Short 1 0
< 20060127_225027.jpg Exif.CanonCs.ZoomSourceWidth Short 1 2272
< 20060127_225027.jpg Exif.CanonCs.ZoomTargetWidth Short 1 2272
< 20060127_225027.jpg Exif.CanonCs.0x0026 Short 1 0
< 20060127_225027.jpg Exif.CanonCs.0x0027 Short 1 0
< 20060127_225027.jpg Exif.CanonCs.0x0028 Short 1 0
< 20060127_225027.jpg Exif.CanonCs.PhotoEffect Short 1 Off
< 20060127_225027.jpg Exif.CanonCs.0x0029 Short 1 0
< 20060127_225027.jpg Exif.CanonCs.0x002a Short 1 32767
< 20060127_225027.jpg Exif.CanonCs.ColorTone Short 1 32767
< 20060127_225027.jpg Exif.CanonCs.0x002b Short 1 32767
< 20060127_225027.jpg Exif.CanonCs.0x002c Short 1 0
< 20060127_225027.jpg Exif.CanonCs.0x002d Short 1 0
@@ -3477,11 +3477,11 @@ Compare image data and extracted data ------------------------------------
> 20031214_000043.exv Exif.CanonCs.0x001e Short 1 0
> 20031214_000043.exv Exif.CanonCs.0x001f Short 1 0
> 20031214_000043.exv Exif.CanonCs.FocusContinuous Short 1 Single
> 20031214_000043.exv Exif.CanonCs.0x0021 Short 1 0
> 20031214_000043.exv Exif.CanonCs.0x0022 Short 1 65535
> 20031214_000043.exv Exif.CanonCs.0x0023 Short 1 49
> 20031214_000043.exv Exif.CanonCs.0x0024 Short 1 2272
> 20031214_000043.exv Exif.CanonCs.0x0025 Short 1 2272
> 20031214_000043.exv Exif.CanonCs.AESetting Short 1 Normal AE
> 20031214_000043.exv Exif.CanonCs.ImageStabilization Short 1 (65535)
> 20031214_000043.exv Exif.CanonCs.DisplayAperture Short 1 49
> 20031214_000043.exv Exif.CanonCs.ZoomSourceWidth Short 1 2272
> 20031214_000043.exv Exif.CanonCs.ZoomTargetWidth Short 1 2272
> 20031214_000043.exv Exif.CanonCs.0x0026 Short 1 0
> 20031214_000043.exv Exif.CanonCs.0x0027 Short 1 1
> 20031214_000043.exv Exif.CanonSi.0x0001 Short 1 0
@@ -3830,16 +3830,16 @@ Compare image data and extracted data ------------------------------------
> 20030925_201850.exv Exif.CanonCs.0x001e Short 1 0
> 20030925_201850.exv Exif.CanonCs.0x001f Short 1 0
> 20030925_201850.exv Exif.CanonCs.FocusContinuous Short 1 (65535)
> 20030925_201850.exv Exif.CanonCs.0x0021 Short 1 65535
> 20030925_201850.exv Exif.CanonCs.0x0022 Short 1 65535
> 20030925_201850.exv Exif.CanonCs.0x0023 Short 1 0
> 20030925_201850.exv Exif.CanonCs.0x0024 Short 1 3072
> 20030925_201850.exv Exif.CanonCs.0x0025 Short 1 3072
> 20030925_201850.exv Exif.CanonCs.AESetting Short 1 (65535)
> 20030925_201850.exv Exif.CanonCs.ImageStabilization Short 1 (65535)
> 20030925_201850.exv Exif.CanonCs.DisplayAperture Short 1 0
> 20030925_201850.exv Exif.CanonCs.ZoomSourceWidth Short 1 3072
> 20030925_201850.exv Exif.CanonCs.ZoomTargetWidth Short 1 3072
> 20030925_201850.exv Exif.CanonCs.0x0026 Short 1 0
> 20030925_201850.exv Exif.CanonCs.0x0027 Short 1 65535
> 20030925_201850.exv Exif.CanonCs.0x0028 Short 1 65535
> 20030925_201850.exv Exif.CanonCs.PhotoEffect Short 1 (65535)
> 20030925_201850.exv Exif.CanonCs.0x0029 Short 1 0
> 20030925_201850.exv Exif.CanonCs.0x002a Short 1 0
> 20030925_201850.exv Exif.CanonCs.ColorTone Short 1 0
> 20030925_201850.exv Exif.CanonCs.0x002b Short 1 32767
> 20030925_201850.exv Exif.CanonCs.0x002c Short 1 65535
> 20030925_201850.exv Exif.CanonCs.0x002d Short 1 65535
@@ -4389,16 +4389,16 @@ Compare image data and extracted data ------------------------------------
> 20060802_095200.exv Exif.CanonCs.0x001e Short 1 0
> 20060802_095200.exv Exif.CanonCs.0x001f Short 1 0
> 20060802_095200.exv Exif.CanonCs.FocusContinuous Short 1 Single
> 20060802_095200.exv Exif.CanonCs.0x0021 Short 1 65535
> 20060802_095200.exv Exif.CanonCs.0x0022 Short 1 65535
> 20060802_095200.exv Exif.CanonCs.0x0023 Short 1 0
> 20060802_095200.exv Exif.CanonCs.0x0024 Short 1 0
> 20060802_095200.exv Exif.CanonCs.0x0025 Short 1 0
> 20060802_095200.exv Exif.CanonCs.AESetting Short 1 (65535)
> 20060802_095200.exv Exif.CanonCs.ImageStabilization Short 1 (65535)
> 20060802_095200.exv Exif.CanonCs.DisplayAperture Short 1 0
> 20060802_095200.exv Exif.CanonCs.ZoomSourceWidth Short 1 0
> 20060802_095200.exv Exif.CanonCs.ZoomTargetWidth Short 1 0
> 20060802_095200.exv Exif.CanonCs.0x0026 Short 1 0
> 20060802_095200.exv Exif.CanonCs.0x0027 Short 1 65535
> 20060802_095200.exv Exif.CanonCs.0x0028 Short 1 0
> 20060802_095200.exv Exif.CanonCs.PhotoEffect Short 1 Off
> 20060802_095200.exv Exif.CanonCs.0x0029 Short 1 32767
> 20060802_095200.exv Exif.CanonCs.0x002a Short 1 0
> 20060802_095200.exv Exif.CanonCs.ColorTone Short 1 0
> 20060802_095200.exv Exif.CanonCs.0x002b Short 1 32767
> 20060802_095200.exv Exif.CanonCs.0x002c Short 1 65535
> 20060802_095200.exv Exif.CanonCs.0x002d Short 1 65535
@@ -4696,16 +4696,16 @@ Compare image data and extracted data ------------------------------------
> 20060127_225027.exv Exif.CanonCs.0x001e Short 1 0
> 20060127_225027.exv Exif.CanonCs.0x001f Short 1 0
> 20060127_225027.exv Exif.CanonCs.FocusContinuous Short 1 Single
> 20060127_225027.exv Exif.CanonCs.0x0021 Short 1 0
> 20060127_225027.exv Exif.CanonCs.0x0022 Short 1 65535
> 20060127_225027.exv Exif.CanonCs.0x0023 Short 1 0
> 20060127_225027.exv Exif.CanonCs.0x0024 Short 1 2272
> 20060127_225027.exv Exif.CanonCs.0x0025 Short 1 2272
> 20060127_225027.exv Exif.CanonCs.AESetting Short 1 Normal AE
> 20060127_225027.exv Exif.CanonCs.ImageStabilization Short 1 (65535)
> 20060127_225027.exv Exif.CanonCs.DisplayAperture Short 1 0
> 20060127_225027.exv Exif.CanonCs.ZoomSourceWidth Short 1 2272
> 20060127_225027.exv Exif.CanonCs.ZoomTargetWidth Short 1 2272
> 20060127_225027.exv Exif.CanonCs.0x0026 Short 1 0
> 20060127_225027.exv Exif.CanonCs.0x0027 Short 1 0
> 20060127_225027.exv Exif.CanonCs.0x0028 Short 1 0
> 20060127_225027.exv Exif.CanonCs.PhotoEffect Short 1 Off
> 20060127_225027.exv Exif.CanonCs.0x0029 Short 1 0
> 20060127_225027.exv Exif.CanonCs.0x002a Short 1 32767
> 20060127_225027.exv Exif.CanonCs.ColorTone Short 1 32767
> 20060127_225027.exv Exif.CanonCs.0x002b Short 1 32767
> 20060127_225027.exv Exif.CanonCs.0x002c Short 1 0
> 20060127_225027.exv Exif.CanonCs.0x002d Short 1 0
@@ -5029,11 +5029,11 @@ Compare original and inserted image data ---------------------------------
< 20031214_000043.jpg Exif.CanonCs.0x001e Short 1 0
< 20031214_000043.jpg Exif.CanonCs.0x001f Short 1 0
< 20031214_000043.jpg Exif.CanonCs.FocusContinuous Short 1 Single
< 20031214_000043.jpg Exif.CanonCs.0x0021 Short 1 0
< 20031214_000043.jpg Exif.CanonCs.0x0022 Short 1 65535
< 20031214_000043.jpg Exif.CanonCs.0x0023 Short 1 49
< 20031214_000043.jpg Exif.CanonCs.0x0024 Short 1 2272
< 20031214_000043.jpg Exif.CanonCs.0x0025 Short 1 2272
< 20031214_000043.jpg Exif.CanonCs.AESetting Short 1 Normal AE
< 20031214_000043.jpg Exif.CanonCs.ImageStabilization Short 1 (65535)
< 20031214_000043.jpg Exif.CanonCs.DisplayAperture Short 1 49
< 20031214_000043.jpg Exif.CanonCs.ZoomSourceWidth Short 1 2272
< 20031214_000043.jpg Exif.CanonCs.ZoomTargetWidth Short 1 2272
< 20031214_000043.jpg Exif.CanonCs.0x0026 Short 1 0
< 20031214_000043.jpg Exif.CanonCs.0x0027 Short 1 1
< 20031214_000043.jpg Exif.CanonSi.0x0001 Short 1 0
@@ -5382,16 +5382,16 @@ Compare original and inserted image data ---------------------------------
< 20030925_201850.jpg Exif.CanonCs.0x001e Short 1 0
< 20030925_201850.jpg Exif.CanonCs.0x001f Short 1 0
< 20030925_201850.jpg Exif.CanonCs.FocusContinuous Short 1 (65535)
< 20030925_201850.jpg Exif.CanonCs.0x0021 Short 1 65535
< 20030925_201850.jpg Exif.CanonCs.0x0022 Short 1 65535
< 20030925_201850.jpg Exif.CanonCs.0x0023 Short 1 0
< 20030925_201850.jpg Exif.CanonCs.0x0024 Short 1 3072
< 20030925_201850.jpg Exif.CanonCs.0x0025 Short 1 3072
< 20030925_201850.jpg Exif.CanonCs.AESetting Short 1 (65535)
< 20030925_201850.jpg Exif.CanonCs.ImageStabilization Short 1 (65535)
< 20030925_201850.jpg Exif.CanonCs.DisplayAperture Short 1 0
< 20030925_201850.jpg Exif.CanonCs.ZoomSourceWidth Short 1 3072
< 20030925_201850.jpg Exif.CanonCs.ZoomTargetWidth Short 1 3072
< 20030925_201850.jpg Exif.CanonCs.0x0026 Short 1 0
< 20030925_201850.jpg Exif.CanonCs.0x0027 Short 1 65535
< 20030925_201850.jpg Exif.CanonCs.0x0028 Short 1 65535
< 20030925_201850.jpg Exif.CanonCs.PhotoEffect Short 1 (65535)
< 20030925_201850.jpg Exif.CanonCs.0x0029 Short 1 0
< 20030925_201850.jpg Exif.CanonCs.0x002a Short 1 0
< 20030925_201850.jpg Exif.CanonCs.ColorTone Short 1 0
< 20030925_201850.jpg Exif.CanonCs.0x002b Short 1 32767
< 20030925_201850.jpg Exif.CanonCs.0x002c Short 1 65535
< 20030925_201850.jpg Exif.CanonCs.0x002d Short 1 65535
@@ -5941,16 +5941,16 @@ Compare original and inserted image data ---------------------------------
< 20060802_095200.jpg Exif.CanonCs.0x001e Short 1 0
< 20060802_095200.jpg Exif.CanonCs.0x001f Short 1 0
< 20060802_095200.jpg Exif.CanonCs.FocusContinuous Short 1 Single
< 20060802_095200.jpg Exif.CanonCs.0x0021 Short 1 65535
< 20060802_095200.jpg Exif.CanonCs.0x0022 Short 1 65535
< 20060802_095200.jpg Exif.CanonCs.0x0023 Short 1 0
< 20060802_095200.jpg Exif.CanonCs.0x0024 Short 1 0
< 20060802_095200.jpg Exif.CanonCs.0x0025 Short 1 0
< 20060802_095200.jpg Exif.CanonCs.AESetting Short 1 (65535)
< 20060802_095200.jpg Exif.CanonCs.ImageStabilization Short 1 (65535)
< 20060802_095200.jpg Exif.CanonCs.DisplayAperture Short 1 0
< 20060802_095200.jpg Exif.CanonCs.ZoomSourceWidth Short 1 0
< 20060802_095200.jpg Exif.CanonCs.ZoomTargetWidth Short 1 0
< 20060802_095200.jpg Exif.CanonCs.0x0026 Short 1 0
< 20060802_095200.jpg Exif.CanonCs.0x0027 Short 1 65535
< 20060802_095200.jpg Exif.CanonCs.0x0028 Short 1 0
< 20060802_095200.jpg Exif.CanonCs.PhotoEffect Short 1 Off
< 20060802_095200.jpg Exif.CanonCs.0x0029 Short 1 32767
< 20060802_095200.jpg Exif.CanonCs.0x002a Short 1 0
< 20060802_095200.jpg Exif.CanonCs.ColorTone Short 1 0
< 20060802_095200.jpg Exif.CanonCs.0x002b Short 1 32767
< 20060802_095200.jpg Exif.CanonCs.0x002c Short 1 65535
< 20060802_095200.jpg Exif.CanonCs.0x002d Short 1 65535
@@ -6248,16 +6248,16 @@ Compare original and inserted image data ---------------------------------
< 20060127_225027.jpg Exif.CanonCs.0x001e Short 1 0
< 20060127_225027.jpg Exif.CanonCs.0x001f Short 1 0
< 20060127_225027.jpg Exif.CanonCs.FocusContinuous Short 1 Single
< 20060127_225027.jpg Exif.CanonCs.0x0021 Short 1 0
< 20060127_225027.jpg Exif.CanonCs.0x0022 Short 1 65535
< 20060127_225027.jpg Exif.CanonCs.0x0023 Short 1 0
< 20060127_225027.jpg Exif.CanonCs.0x0024 Short 1 2272
< 20060127_225027.jpg Exif.CanonCs.0x0025 Short 1 2272
< 20060127_225027.jpg Exif.CanonCs.AESetting Short 1 Normal AE
< 20060127_225027.jpg Exif.CanonCs.ImageStabilization Short 1 (65535)
< 20060127_225027.jpg Exif.CanonCs.DisplayAperture Short 1 0
< 20060127_225027.jpg Exif.CanonCs.ZoomSourceWidth Short 1 2272
< 20060127_225027.jpg Exif.CanonCs.ZoomTargetWidth Short 1 2272
< 20060127_225027.jpg Exif.CanonCs.0x0026 Short 1 0
< 20060127_225027.jpg Exif.CanonCs.0x0027 Short 1 0
< 20060127_225027.jpg Exif.CanonCs.0x0028 Short 1 0
< 20060127_225027.jpg Exif.CanonCs.PhotoEffect Short 1 Off
< 20060127_225027.jpg Exif.CanonCs.0x0029 Short 1 0
< 20060127_225027.jpg Exif.CanonCs.0x002a Short 1 32767
< 20060127_225027.jpg Exif.CanonCs.ColorTone Short 1 32767
< 20060127_225027.jpg Exif.CanonCs.0x002b Short 1 32767
< 20060127_225027.jpg Exif.CanonCs.0x002c Short 1 0
< 20060127_225027.jpg Exif.CanonCs.0x002d Short 1 0
@@ -6418,11 +6418,11 @@ Compare original and inserted image data ---------------------------------
> 20031214_000043.exv Exif.CanonCs.0x001e Short 1 0
> 20031214_000043.exv Exif.CanonCs.0x001f Short 1 0
> 20031214_000043.exv Exif.CanonCs.FocusContinuous Short 1 Single
> 20031214_000043.exv Exif.CanonCs.0x0021 Short 1 0
> 20031214_000043.exv Exif.CanonCs.0x0022 Short 1 65535
> 20031214_000043.exv Exif.CanonCs.0x0023 Short 1 49
> 20031214_000043.exv Exif.CanonCs.0x0024 Short 1 2272
> 20031214_000043.exv Exif.CanonCs.0x0025 Short 1 2272
> 20031214_000043.exv Exif.CanonCs.AESetting Short 1 Normal AE
> 20031214_000043.exv Exif.CanonCs.ImageStabilization Short 1 (65535)
> 20031214_000043.exv Exif.CanonCs.DisplayAperture Short 1 49
> 20031214_000043.exv Exif.CanonCs.ZoomSourceWidth Short 1 2272
> 20031214_000043.exv Exif.CanonCs.ZoomTargetWidth Short 1 2272
> 20031214_000043.exv Exif.CanonCs.0x0026 Short 1 0
> 20031214_000043.exv Exif.CanonCs.0x0027 Short 1 1
> 20031214_000043.exv Exif.CanonSi.0x0001 Short 1 0
@@ -6771,16 +6771,16 @@ Compare original and inserted image data ---------------------------------
> 20030925_201850.exv Exif.CanonCs.0x001e Short 1 0
> 20030925_201850.exv Exif.CanonCs.0x001f Short 1 0
> 20030925_201850.exv Exif.CanonCs.FocusContinuous Short 1 (65535)
> 20030925_201850.exv Exif.CanonCs.0x0021 Short 1 65535
> 20030925_201850.exv Exif.CanonCs.0x0022 Short 1 65535
> 20030925_201850.exv Exif.CanonCs.0x0023 Short 1 0
> 20030925_201850.exv Exif.CanonCs.0x0024 Short 1 3072
> 20030925_201850.exv Exif.CanonCs.0x0025 Short 1 3072
> 20030925_201850.exv Exif.CanonCs.AESetting Short 1 (65535)
> 20030925_201850.exv Exif.CanonCs.ImageStabilization Short 1 (65535)
> 20030925_201850.exv Exif.CanonCs.DisplayAperture Short 1 0
> 20030925_201850.exv Exif.CanonCs.ZoomSourceWidth Short 1 3072
> 20030925_201850.exv Exif.CanonCs.ZoomTargetWidth Short 1 3072
> 20030925_201850.exv Exif.CanonCs.0x0026 Short 1 0
> 20030925_201850.exv Exif.CanonCs.0x0027 Short 1 65535
> 20030925_201850.exv Exif.CanonCs.0x0028 Short 1 65535
> 20030925_201850.exv Exif.CanonCs.PhotoEffect Short 1 (65535)
> 20030925_201850.exv Exif.CanonCs.0x0029 Short 1 0
> 20030925_201850.exv Exif.CanonCs.0x002a Short 1 0
> 20030925_201850.exv Exif.CanonCs.ColorTone Short 1 0
> 20030925_201850.exv Exif.CanonCs.0x002b Short 1 32767
> 20030925_201850.exv Exif.CanonCs.0x002c Short 1 65535
> 20030925_201850.exv Exif.CanonCs.0x002d Short 1 65535
@@ -7330,16 +7330,16 @@ Compare original and inserted image data ---------------------------------
> 20060802_095200.exv Exif.CanonCs.0x001e Short 1 0
> 20060802_095200.exv Exif.CanonCs.0x001f Short 1 0
> 20060802_095200.exv Exif.CanonCs.FocusContinuous Short 1 Single
> 20060802_095200.exv Exif.CanonCs.0x0021 Short 1 65535
> 20060802_095200.exv Exif.CanonCs.0x0022 Short 1 65535
> 20060802_095200.exv Exif.CanonCs.0x0023 Short 1 0
> 20060802_095200.exv Exif.CanonCs.0x0024 Short 1 0
> 20060802_095200.exv Exif.CanonCs.0x0025 Short 1 0
> 20060802_095200.exv Exif.CanonCs.AESetting Short 1 (65535)
> 20060802_095200.exv Exif.CanonCs.ImageStabilization Short 1 (65535)
> 20060802_095200.exv Exif.CanonCs.DisplayAperture Short 1 0
> 20060802_095200.exv Exif.CanonCs.ZoomSourceWidth Short 1 0
> 20060802_095200.exv Exif.CanonCs.ZoomTargetWidth Short 1 0
> 20060802_095200.exv Exif.CanonCs.0x0026 Short 1 0
> 20060802_095200.exv Exif.CanonCs.0x0027 Short 1 65535
> 20060802_095200.exv Exif.CanonCs.0x0028 Short 1 0
> 20060802_095200.exv Exif.CanonCs.PhotoEffect Short 1 Off
> 20060802_095200.exv Exif.CanonCs.0x0029 Short 1 32767
> 20060802_095200.exv Exif.CanonCs.0x002a Short 1 0
> 20060802_095200.exv Exif.CanonCs.ColorTone Short 1 0
> 20060802_095200.exv Exif.CanonCs.0x002b Short 1 32767
> 20060802_095200.exv Exif.CanonCs.0x002c Short 1 65535
> 20060802_095200.exv Exif.CanonCs.0x002d Short 1 65535
@@ -7637,16 +7637,16 @@ Compare original and inserted image data ---------------------------------
> 20060127_225027.exv Exif.CanonCs.0x001e Short 1 0
> 20060127_225027.exv Exif.CanonCs.0x001f Short 1 0
> 20060127_225027.exv Exif.CanonCs.FocusContinuous Short 1 Single
> 20060127_225027.exv Exif.CanonCs.0x0021 Short 1 0
> 20060127_225027.exv Exif.CanonCs.0x0022 Short 1 65535
> 20060127_225027.exv Exif.CanonCs.0x0023 Short 1 0
> 20060127_225027.exv Exif.CanonCs.0x0024 Short 1 2272
> 20060127_225027.exv Exif.CanonCs.0x0025 Short 1 2272
> 20060127_225027.exv Exif.CanonCs.AESetting Short 1 Normal AE
> 20060127_225027.exv Exif.CanonCs.ImageStabilization Short 1 (65535)
> 20060127_225027.exv Exif.CanonCs.DisplayAperture Short 1 0
> 20060127_225027.exv Exif.CanonCs.ZoomSourceWidth Short 1 2272
> 20060127_225027.exv Exif.CanonCs.ZoomTargetWidth Short 1 2272
> 20060127_225027.exv Exif.CanonCs.0x0026 Short 1 0
> 20060127_225027.exv Exif.CanonCs.0x0027 Short 1 0
> 20060127_225027.exv Exif.CanonCs.0x0028 Short 1 0
> 20060127_225027.exv Exif.CanonCs.PhotoEffect Short 1 Off
> 20060127_225027.exv Exif.CanonCs.0x0029 Short 1 0
> 20060127_225027.exv Exif.CanonCs.0x002a Short 1 32767
> 20060127_225027.exv Exif.CanonCs.ColorTone Short 1 32767
> 20060127_225027.exv Exif.CanonCs.0x002b Short 1 32767
> 20060127_225027.exv Exif.CanonCs.0x002c Short 1 0
> 20060127_225027.exv Exif.CanonCs.0x002d Short 1 0