xymp
/
exiv2
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Validated final regression test script, fixed minor Canon bugs.

Browse Source
v0.27.3
Andreas Huggel 17 years ago
parent 31ed169623
commit ff875f5759
3 changed files with 1589 additions and 1512 deletions
Show Stats Download Patch File Download Diff File

4
src/tiffimage.cpp
Unescape Escape View File

@ -345,9 +345,9 @@ namespace Exiv2 {
// Canon makernote
{ 0x0001, Group::canonmn, Group::canoncs, 0x927c, Group::exif, newTiffArrayEntry<ttUnsignedShort, true> },
{ 0x0004, Group::canonmn, Group::canonsi, 0x927c, Group::exif, newTiffArrayEntry<ttUnsignedShort, true> },
{ 0x0005, Group::canonmn, Group::canonpa, 0x927c, Group::exif, newTiffArrayEntry<ttUnsignedShort, true> },
{ 0x0005, Group::canonmn, Group::canonpa, 0x927c, Group::exif, newTiffArrayEntry<ttUnsignedShort, false> },
{ 0x000f, Group::canonmn, Group::canoncf, 0x927c, Group::exif, newTiffArrayEntry<ttUnsignedShort, true> },
{ 0x0012, Group::canonmn, Group::canonpi, 0x927c, Group::exif, newTiffArrayEntry<ttUnsignedShort, true> },
{ 0x0012, Group::canonmn, Group::canonpi, 0x927c, Group::exif, newTiffArrayEntry<ttUnsignedShort, false> },
{ Tag::next, Group::canonmn, Group::ignr, 0x927c, Group::exif, newTiffDirectory },
{ Tag::all, Group::canonmn, Group::canonmn, 0x927c, Group::exif, newTiffEntry },

3089
test/data/exiv2-test.out
View File

File diff suppressed because one or more lines are too long

8
test/data/write2-test.out
Unescape Escape View File

@ -22,11 +22,11 @@ Exif.CanonSi.ISOSpeed 0x0002 Makernote Short 1
Exif.CanonSi.0x0003 0x0003 Makernote Short 1 0
Exif.CanonSi.TargetAperture 0x0004 Makernote Short 1 0
Exif.CanonSi.TargetShutterSpeed 0x0005 Makernote Short 1 42
Exif.CanonPa.0x0000 0x0000 Makernote Short 1 4
Exif.CanonPa.0x0000 0x0000 Makernote Short 1 0
Exif.CanonPa.0x0001 0x0001 Makernote Short 1 45
Exif.CanonCf.0x0000 0x0000 Makernote Short 1 4
Exif.CanonCf.NoiseReduction 0x0001 Makernote Short 1 43
Exif.CanonPi.0x0000 0x0000 Makernote Short 1 4
Exif.CanonPi.0x0000 0x0000 Makernote Short 1 0
Exif.CanonPi.0x0001 0x0001 Makernote Short 1 44
Exif.Canon.0xabcd 0xabcd Makernote Ascii 22 A Canon makernote tag
@ -43,11 +43,11 @@ Exif.CanonSi.ISOSpeed 0x0002 Makernote Short 1
Exif.CanonSi.0x0003 0x0003 Makernote Short 1 0
Exif.CanonSi.TargetAperture 0x0004 Makernote Short 1 99
Exif.CanonSi.TargetShutterSpeed 0x0005 Makernote Short 1 42
Exif.CanonPa.0x0000 0x0000 Makernote Short 1 4
Exif.CanonPa.0x0000 0x0000 Makernote Short 1 0
Exif.CanonPa.0x0001 0x0001 Makernote Short 1 45
Exif.CanonCf.0x0000 0x0000 Makernote Short 1 4
Exif.CanonCf.NoiseReduction 0x0001 Makernote Short 1 43
Exif.CanonPi.0x0000 0x0000 Makernote Short 1 4
Exif.CanonPi.0x0000 0x0000 Makernote Short 1 0
Exif.CanonPi.0x0001 0x0001 Makernote Short 1 44
Exif.Canon.0xabcd 0xabcd Makernote Ascii 22 A Canon makernote tag

Write Preview
Loading…
Cancel
Save