From 567618398c6923be9eba0ddef044e064aa4078fb Mon Sep 17 00:00:00 2001 From: Crane Date: Mon, 24 Feb 2020 14:50:06 +0800 Subject: [PATCH] bugfix: change 0xa000 tag name (#38) According to DC-08-2012 FlashPixVersion shoule be FlashpixVersion --- libexif/exif-tag.c | 2 +- test/testdata/canon_makernote_variant_1.jpg.parsed | 2 +- test/testdata/fuji_makernote_variant_1.jpg.parsed | 2 +- test/testdata/olympus_makernote_variant_2.jpg.parsed | 2 +- test/testdata/olympus_makernote_variant_3.jpg.parsed | 2 +- test/testdata/olympus_makernote_variant_4.jpg.parsed | 2 +- test/testdata/olympus_makernote_variant_5.jpg.parsed | 2 +- test/testdata/pentax_makernote_variant_2.jpg.parsed | 2 +- test/testdata/pentax_makernote_variant_3.jpg.parsed | 2 +- test/testdata/pentax_makernote_variant_4.jpg.parsed | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libexif/exif-tag.c b/libexif/exif-tag.c index 506163f..6c85e33 100644 --- a/libexif/exif-tag.c +++ b/libexif/exif-tag.c @@ -668,7 +668,7 @@ static const struct TagEntry { N_("A character string giving the image subject, encoded in " "UTF-16LE."), { ESL_OOOO, ESL_NNNN, ESL_NNNN, ESL_NNNN, ESL_NNNN } }, - {EXIF_TAG_FLASH_PIX_VERSION, "FlashPixVersion", "FlashPixVersion", + {EXIF_TAG_FLASH_PIX_VERSION, "FlashpixVersion", "FlashPixVersion", N_("The FlashPix format version supported by a FPXR file."), { ESL_NNNN, ESL_NNNN, ESL_MMMM, ESL_NNNN, ESL_NNNN } }, {EXIF_TAG_COLOR_SPACE, "ColorSpace", N_("Color Space"), diff --git a/test/testdata/canon_makernote_variant_1.jpg.parsed b/test/testdata/canon_makernote_variant_1.jpg.parsed index 6392355..fd18a1b 100644 --- a/test/testdata/canon_makernote_variant_1.jpg.parsed +++ b/test/testdata/canon_makernote_variant_1.jpg.parsed @@ -87,7 +87,7 @@ Byte order: Intel Entry 15: UserComment (Undefined) Size, Comps: 264, 264 Value: - Entry 16: FlashPixVersion (Undefined) + Entry 16: FlashpixVersion (Undefined) Size, Comps: 4, 4 Value: FlashPix Version 1.0 Entry 17: ColorSpace (Short) diff --git a/test/testdata/fuji_makernote_variant_1.jpg.parsed b/test/testdata/fuji_makernote_variant_1.jpg.parsed index 8160509..d0990f1 100644 --- a/test/testdata/fuji_makernote_variant_1.jpg.parsed +++ b/test/testdata/fuji_makernote_variant_1.jpg.parsed @@ -111,7 +111,7 @@ Byte order: Intel Entry 18: MakerNote (Undefined) Size, Comps: 2954, 2954 Value: 2954 bytes undefined data - Entry 19: FlashPixVersion (Undefined) + Entry 19: FlashpixVersion (Undefined) Size, Comps: 4, 4 Value: FlashPix Version 1.0 Entry 20: ColorSpace (Short) diff --git a/test/testdata/olympus_makernote_variant_2.jpg.parsed b/test/testdata/olympus_makernote_variant_2.jpg.parsed index a2f75d0..f717533 100644 --- a/test/testdata/olympus_makernote_variant_2.jpg.parsed +++ b/test/testdata/olympus_makernote_variant_2.jpg.parsed @@ -96,7 +96,7 @@ Byte order: Intel Entry 16: UserComment (Undefined) Size, Comps: 16, 16 Value: - Entry 17: FlashPixVersion (Undefined) + Entry 17: FlashpixVersion (Undefined) Size, Comps: 4, 4 Value: FlashPix Version 1.0 Entry 18: ColorSpace (Short) diff --git a/test/testdata/olympus_makernote_variant_3.jpg.parsed b/test/testdata/olympus_makernote_variant_3.jpg.parsed index d10596c..946678a 100644 --- a/test/testdata/olympus_makernote_variant_3.jpg.parsed +++ b/test/testdata/olympus_makernote_variant_3.jpg.parsed @@ -96,7 +96,7 @@ Byte order: Intel Entry 15: UserComment (Undefined) Size, Comps: 125, 125 Value: - Entry 16: FlashPixVersion (Undefined) + Entry 16: FlashpixVersion (Undefined) Size, Comps: 4, 4 Value: FlashPix Version 1.0 Entry 17: ColorSpace (Short) diff --git a/test/testdata/olympus_makernote_variant_4.jpg.parsed b/test/testdata/olympus_makernote_variant_4.jpg.parsed index 7431319..e158ef9 100644 --- a/test/testdata/olympus_makernote_variant_4.jpg.parsed +++ b/test/testdata/olympus_makernote_variant_4.jpg.parsed @@ -102,7 +102,7 @@ Byte order: Intel Entry 15: UserComment (Undefined) Size, Comps: 9, 9 Value: - Entry 16: FlashPixVersion (Undefined) + Entry 16: FlashpixVersion (Undefined) Size, Comps: 4, 4 Value: FlashPix Version 1.0 Entry 17: ColorSpace (Short) diff --git a/test/testdata/olympus_makernote_variant_5.jpg.parsed b/test/testdata/olympus_makernote_variant_5.jpg.parsed index e4df13c..e6cfaa5 100644 --- a/test/testdata/olympus_makernote_variant_5.jpg.parsed +++ b/test/testdata/olympus_makernote_variant_5.jpg.parsed @@ -102,7 +102,7 @@ Byte order: Intel Entry 17: UserComment (Undefined) Size, Comps: 126, 126 Value: - Entry 18: FlashPixVersion (Undefined) + Entry 18: FlashpixVersion (Undefined) Size, Comps: 4, 4 Value: FlashPix Version 1.0 Entry 19: ColorSpace (Short) diff --git a/test/testdata/pentax_makernote_variant_2.jpg.parsed b/test/testdata/pentax_makernote_variant_2.jpg.parsed index d72b889..55163b3 100644 --- a/test/testdata/pentax_makernote_variant_2.jpg.parsed +++ b/test/testdata/pentax_makernote_variant_2.jpg.parsed @@ -87,7 +87,7 @@ Byte order: Motorola Entry 13: MakerNote (Undefined) Size, Comps: 474, 474 Value: 474 bytes undefined data - Entry 14: FlashPixVersion (Undefined) + Entry 14: FlashpixVersion (Undefined) Size, Comps: 4, 4 Value: FlashPix Version 1.0 Entry 15: ColorSpace (Short) diff --git a/test/testdata/pentax_makernote_variant_3.jpg.parsed b/test/testdata/pentax_makernote_variant_3.jpg.parsed index 91902f5..5408dbc 100644 --- a/test/testdata/pentax_makernote_variant_3.jpg.parsed +++ b/test/testdata/pentax_makernote_variant_3.jpg.parsed @@ -87,7 +87,7 @@ Byte order: Intel Entry 13: MakerNote (Undefined) Size, Comps: 986, 986 Value: 986 bytes undefined data - Entry 14: FlashPixVersion (Undefined) + Entry 14: FlashpixVersion (Undefined) Size, Comps: 4, 4 Value: FlashPix Version 1.0 Entry 15: ColorSpace (Short) diff --git a/test/testdata/pentax_makernote_variant_4.jpg.parsed b/test/testdata/pentax_makernote_variant_4.jpg.parsed index 266dd0d..fa60d06 100644 --- a/test/testdata/pentax_makernote_variant_4.jpg.parsed +++ b/test/testdata/pentax_makernote_variant_4.jpg.parsed @@ -93,7 +93,7 @@ Byte order: Motorola Entry 15: MakerNote (Undefined) Size, Comps: 8216, 8216 Value: 8216 bytes undefined data - Entry 16: FlashPixVersion (Undefined) + Entry 16: FlashpixVersion (Undefined) Size, Comps: 4, 4 Value: FlashPix Version 1.0 Entry 17: ColorSpace (Short) -- 2.7.4