Use exif_mnote_data_get_name in test-parse.c

This is analagous to exif_tag_get_name that is used for the regular
tags.

diff --git a/test/test-parse.c b/test/test-parse.c
index 388f739..5b6bfba 100644 (file)
--- a/test/test-parse.c
+++ b/test/test-parse.c
@@ -66,12 +66,12 @@ static void dump_makernote(ExifData *d) {
     printf("  MakerNote\n");
     for (i=0; i < num; ++i) {
       if (exif_mnote_data_get_value(mn, i, buf, sizeof(buf))) {
-       const char *title = exif_mnote_data_get_title(mn, i);
+       const char *name = exif_mnote_data_get_name(mn, i);
        unsigned int id = exif_mnote_data_get_id(mn, i);
-       if (!title)
-           title = "(unknown)";
+       if (!name)
+           name = "(unknown)";
        printf("    Entry %u: %u, %s\n"
-              "      Size: %u\n", i, id, title, strlen(buf));
+              "      Size: %u\n", i, id, name, strlen(buf));
       }
     }
   }

diff --git a/test/testdata/canon_makernote_variant_1.jpg.parsed b/test/testdata/canon_makernote_variant_1.jpg.parsed
index 5dea206..0f9b719 100644 (file)
--- a/test/testdata/canon_makernote_variant_1.jpg.parsed
+++ b/test/testdata/canon_makernote_variant_1.jpg.parsed
@@ -317,13 +317,13 @@ File canon_makernote_variant_1.jpg
       Size: 101
     Entry 86: 19, (unknown)
       Size: 8
-    Entry 87: 6, Image Type
+    Entry 87: 6, ImageType
       Size: 22
-    Entry 88: 7, Firmware Version
+    Entry 88: 7, FirmwareVersion
       Size: 21
-    Entry 89: 8, Image Number
+    Entry 89: 8, ImageNumber
       Size: 8
-    Entry 90: 9, Owner Name
+    Entry 90: 9, OwnerName
       Size: 0
     Entry 91: 16, (unknown)
       Size: 9

diff --git a/test/testdata/fuji_makernote_variant_1.jpg.parsed b/test/testdata/fuji_makernote_variant_1.jpg.parsed
index e12e7ef..0fa4306 100644 (file)
--- a/test/testdata/fuji_makernote_variant_1.jpg.parsed
+++ b/test/testdata/fuji_makernote_variant_1.jpg.parsed
@@ -167,49 +167,49 @@ File fuji_makernote_variant_1.jpg
       Size, Comps: 4, 4
       Value: 0100
   MakerNote
-    Entry 0: 0, Maker Note Version
+    Entry 0: 0, Version
       Size: 4
-    Entry 1: 16, Serial Number
+    Entry 1: 16, SerialNumber
       Size: 30
     Entry 2: 4096, Quality
       Size: 7
     Entry 3: 4097, Sharpness
       Size: 6
-    Entry 4: 4098, White Balance
+    Entry 4: 4098, WhiteBalance
       Size: 4
-    Entry 5: 4099, Chromaticity Saturation
+    Entry 5: 4099, ChromaticitySaturation
       Size: 8
-    Entry 6: 4112, Flash Mode
+    Entry 6: 4112, FlashMode
       Size: 17
-    Entry 7: 4113, Flash Firing Strength Compensation
+    Entry 7: 4113, FlashStrength
       Size: 6
-    Entry 8: 4128, Macro Mode
+    Entry 8: 4128, MacroMode
       Size: 3
-    Entry 9: 4129, Focusing Mode
+    Entry 9: 4129, FocusingMode
       Size: 4
     Entry 10: 4130, (unknown)
       Size: 1
-    Entry 11: 4131, Focus Point
+    Entry 11: 4131, FocusPoint
       Size: 8
-    Entry 12: 4144, Slow Synchro Mode
+    Entry 12: 4144, SlowSynchro
       Size: 3
-    Entry 13: 4145, Picture Mode
+    Entry 13: 4145, PictureMode
       Size: 4
     Entry 14: 4146, (unknown)
       Size: 1
-    Entry 15: 4352, Continuous Taking
+    Entry 15: 4352, ContinuousTaking
       Size: 3
-    Entry 16: 4353, Continuous Sequence Number
+    Entry 16: 4353, ContinuousSequence
       Size: 1
     Entry 17: 4608, (unknown)
       Size: 1
-    Entry 18: 4624, FinePix Color
+    Entry 18: 4624, FinePixColor
       Size: 10
-    Entry 19: 4864, Blur Check
+    Entry 19: 4864, BlurCheck
       Size: 7
-    Entry 20: 4865, Auto Focus Check
+    Entry 20: 4865, AutoFocusCheck
       Size: 12
-    Entry 21: 4866, Auto Exposure Check
+    Entry 21: 4866, AutoExposureCheck
       Size: 7
     Entry 22: 5128, (unknown)
       Size: 20

diff --git a/test/testdata/olympus_makernote_variant_2.jpg.parsed b/test/testdata/olympus_makernote_variant_2.jpg.parsed
index 3efdcc7..d84f5aa 100644 (file)
--- a/test/testdata/olympus_makernote_variant_2.jpg.parsed
+++ b/test/testdata/olympus_makernote_variant_2.jpg.parsed
@@ -155,31 +155,31 @@ File olympus_makernote_variant_2.jpg
       Size, Comps: 4, 4
       Value: 0100
   MakerNote
-    Entry 0: 1, Firmware Version
+    Entry 0: 1, Firmware
       Size: 4
-    Entry 1: 2, ISO Setting
+    Entry 1: 2, ISO
       Size: 6
-    Entry 2: 3, Color Mode (?)
+    Entry 2: 3, ColorMode1
       Size: 6
     Entry 3: 4, Quality
       Size: 6
-    Entry 4: 5, White Balance
+    Entry 4: 5, WhiteBalance
       Size: 12
-    Entry 5: 6, Image Sharpening
+    Entry 5: 6, Sharpening
       Size: 6
-    Entry 6: 7, Focus Mode
+    Entry 6: 7, FocusMode
       Size: 6
-    Entry 7: 8, Flash Setting
+    Entry 7: 8, FlashSetting
       Size: 7
     Entry 8: 10, (unknown)
       Size: 5
-    Entry 9: 11, White Balance Fine Adjustment
+    Entry 9: 11, WhiteBalanceFine
       Size: 1
-    Entry 10: 15, ISO Selection
+    Entry 10: 15, ISOSelection
       Size: 6
     Entry 11: 16, (unknown)
       Size: 24
-    Entry 12: 17, Preview Image IFD
+    Entry 12: 17, PreviewImage
       Size: 4
     Entry 13: 26, (unknown)
       Size: 40
@@ -195,13 +195,13 @@ File olympus_makernote_variant_2.jpg
       Size: 1
     Entry 19: 48, (unknown)
       Size: 1
-    Entry 20: 128, Image Adjustment
+    Entry 20: 128, ImageAdjustment
       Size: 13
-    Entry 21: 133, Manual Focus Distance
+    Entry 21: 133, ManualFocusDistance
       Size: 25
-    Entry 22: 134, Digital Zoom
+    Entry 22: 134, DigitalZoom
       Size: 5
-    Entry 23: 136, AF Focus Position
+    Entry 23: 136, AFFocusPosition
       Size: 19
     Entry 24: 143, (unknown)
       Size: 15
@@ -209,7 +209,7 @@ File olympus_makernote_variant_2.jpg
       Size: 1984
     Entry 26: 148, Saturation
       Size: 1
-    Entry 27: 149, Noise Reduction
+    Entry 27: 149, NoiseReduction,
       Size: 4
     Entry 28: 155, (unknown)
       Size: 26

diff --git a/test/testdata/olympus_makernote_variant_3.jpg.parsed b/test/testdata/olympus_makernote_variant_3.jpg.parsed
index 8af2843..2818c79 100644 (file)
--- a/test/testdata/olympus_makernote_variant_3.jpg.parsed
+++ b/test/testdata/olympus_makernote_variant_3.jpg.parsed
@@ -146,23 +146,23 @@ File olympus_makernote_variant_3.jpg
       Size, Comps: 4, 4
       Value: 0100
   MakerNote
-    Entry 0: 512, Speed/Sequence/Panorama Direction
+    Entry 0: 512, Mode
       Size: 10
     Entry 1: 513, Quality
       Size: 11
     Entry 2: 514, Macro
       Size: 11
-    Entry 3: 515, Black & White Mode
+    Entry 3: 515, BWMode
       Size: 2
-    Entry 4: 516, Digital Zoom
+    Entry 4: 516, DigiZoom
       Size: 4
-    Entry 5: 517, Focal Plane Diagonal
+    Entry 5: 517, FocalPlaneDiagonal
       Size: 5
-    Entry 6: 518, Lens Distortion Parameters
+    Entry 6: 518, LensDistortionParams
       Size: 12
-    Entry 7: 519, Firmware Version
+    Entry 7: 519, FirmwareVersion
       Size: 5
-    Entry 8: 521, Camera ID
+    Entry 8: 521, CameraID
       Size: 31
     Entry 9: 8208, (unknown)
       Size: 336

diff --git a/test/testdata/olympus_makernote_variant_4.jpg.parsed b/test/testdata/olympus_makernote_variant_4.jpg.parsed
index bcc683e..46381a5 100644 (file)
--- a/test/testdata/olympus_makernote_variant_4.jpg.parsed
+++ b/test/testdata/olympus_makernote_variant_4.jpg.parsed
@@ -152,9 +152,9 @@ File olympus_makernote_variant_4.jpg
       Size, Comps: 4, 4
       Value: 0100
   MakerNote
-    Entry 0: 512, Speed/Sequence/Panorama Direction
+    Entry 0: 512, Mode
       Size: 8
-    Entry 1: 521, Camera ID
+    Entry 1: 521, CameraID
       Size: 31
     Entry 2: 8208, (unknown)
       Size: 0

diff --git a/test/testdata/olympus_makernote_variant_5.jpg.parsed b/test/testdata/olympus_makernote_variant_5.jpg.parsed
index 5665487..6b9bce0 100644 (file)
--- a/test/testdata/olympus_makernote_variant_5.jpg.parsed
+++ b/test/testdata/olympus_makernote_variant_5.jpg.parsed
@@ -161,53 +161,53 @@ File olympus_makernote_variant_5.jpg
       Size, Comps: 4, 4
       Value: 0100
   MakerNote
-    Entry 0: 256, Thumbnail Image
+    Entry 0: 256, ThumbnailImage
       Size: 1999
-    Entry 1: 512, Speed/Sequence/Panorama Direction
+    Entry 1: 512, Mode
       Size: 10
     Entry 2: 513, Quality
       Size: 16
     Entry 3: 514, Macro
       Size: 2
-    Entry 4: 515, Black & White Mode
+    Entry 4: 515, BWMode
       Size: 2
-    Entry 5: 516, Digital Zoom
+    Entry 5: 516, DigiZoom
       Size: 4
-    Entry 6: 526, Sequential Shot
+    Entry 6: 526, SequentialShot
       Size: 4
-    Entry 7: 527, Wide Range
+    Entry 7: 527, WideRange
       Size: 3
-    Entry 8: 528, Color Adjustment Mode
+    Entry 8: 528, ColorAdjustmentMode
       Size: 3
     Entry 9: 529, (unknown)
       Size: 1
-    Entry 10: 530, Focus Mode
+    Entry 10: 530, FocusMode
       Size: 10
-    Entry 11: 531, Quick Shot
+    Entry 11: 531, QuickShot
       Size: 3
-    Entry 12: 532, Self-timer
+    Entry 12: 532, SelfTimer
       Size: 3
     Entry 13: 533, (unknown)
       Size: 1
-    Entry 14: 534, Voice Memo
+    Entry 14: 534, VoiceMemo
       Size: 3
-    Entry 15: 535, Record Shutter Release
+    Entry 15: 535, RecordShutterRelease
       Size: 17
-    Entry 16: 536, Flicker Reduce
+    Entry 16: 536, FlickerReduce
       Size: 3
-    Entry 17: 537, Optical Zoom
+    Entry 17: 537, OpticalZoom
       Size: 2
-    Entry 18: 538, CCD Sensitivity
+    Entry 18: 538, CCDSensitivity
       Size: 4
-    Entry 19: 539, Digital Zoom
+    Entry 19: 539, DigitalZoom
       Size: 2
     Entry 20: 540, (unknown)
       Size: 2
-    Entry 21: 541, Light Source Special
+    Entry 21: 541, LightSourceSpecial
       Size: 3
     Entry 22: 542, Resaved
       Size: 2
-    Entry 23: 543, Scene Select
+    Entry 23: 543, SceneSelect
       Size: 3
     Entry 24: 544, (unknown)
       Size: 1
@@ -215,9 +215,9 @@ File olympus_makernote_variant_5.jpg
       Size: 3
     Entry 26: 546, (unknown)
       Size: 1
-    Entry 27: 547, Manual Focus Distance
+    Entry 27: 547, ManualFocusDistance
       Size: 45
-    Entry 28: 548, Sequence Shot Interval
+    Entry 28: 548, SequenceShotInterval
       Size: 12
     Entry 29: 549, (unknown)
       Size: 0
@@ -227,7 +227,7 @@ File olympus_makernote_variant_5.jpg
       Size: 1
     Entry 32: 553, (unknown)
       Size: 1
-    Entry 33: 3840, Data Dump
+    Entry 33: 3840, DataDump
       Size: 1999
     Entry 34: 3841, (unknown)
       Size: 1999

diff --git a/test/testdata/pentax_makernote_variant_2.jpg.parsed b/test/testdata/pentax_makernote_variant_2.jpg.parsed
index 5282b93..07c458c 100644 (file)
--- a/test/testdata/pentax_makernote_variant_2.jpg.parsed
+++ b/test/testdata/pentax_makernote_variant_2.jpg.parsed
@@ -134,13 +134,13 @@ File pentax_makernote_variant_2.jpg
       Size, Comps: 4, 4
       Value: 0100
   MakerNote
-    Entry 0: 16386, Preview Size
+    Entry 0: 16386, PentaxPreviewSize
       Size: 8
-    Entry 1: 16387, Preview Length
+    Entry 1: 16387, PentaxPreviewLength
       Size: 2
-    Entry 2: 16388, Preview Start
+    Entry 2: 16388, PentaxPreviewStart
       Size: 5
-    Entry 3: 24576, Preview Start
+    Entry 3: 24576, CasioPreviewStart
       Size: 20
     Entry 4: 24577, (unknown)
       Size: 4
@@ -148,15 +148,15 @@ File pentax_makernote_variant_2.jpg
       Size: 0
     Entry 6: 24579, (unknown)
       Size: 20
-    Entry 7: 24593, White Balance Bias
+    Entry 7: 24593, WhiteBalanceBias
       Size: 7
-    Entry 8: 24594, White Balance
+    Entry 8: 24594, WhiteBalance
       Size: 3
     Entry 9: 24595, (unknown)
       Size: 2
     Entry 10: 24609, (unknown)
       Size: 24
-    Entry 11: 24610, Object Distance
+    Entry 11: 24610, ObjectDistance
       Size: 5
     Entry 12: 24611, (unknown)
       Size: 2
@@ -166,21 +166,21 @@ File pentax_makernote_variant_2.jpg
       Size: 20
     Entry 15: 24627, (unknown)
       Size: 2
-    Entry 16: 24628, Flash Distance
+    Entry 16: 24628, FlashDistance
       Size: 5
-    Entry 17: 28672, Record Mode
+    Entry 17: 28672, RecordMode
       Size: 3
-    Entry 18: 28673, Self-timer
+    Entry 18: 28673, SelfTimer
       Size: 2
-    Entry 19: 28674, Quality Level
+    Entry 19: 28674, CasioQuality
       Size: 2
-    Entry 20: 28675, Focus Mode
+    Entry 20: 28675, CasioFocusMode
       Size: 2
     Entry 21: 28677, (unknown)
       Size: 4
-    Entry 22: 28678, Time Zone
+    Entry 22: 28678, TimeZone
       Size: 3
-    Entry 23: 28679, Bestshot Mode
+    Entry 23: 28679, BestshotMode
       Size: 3
     Entry 24: 28689, (unknown)
       Size: 20
@@ -188,9 +188,9 @@ File pentax_makernote_variant_2.jpg
       Size: 20
     Entry 26: 28691, (unknown)
       Size: 20
-    Entry 27: 28692, CCS ISO Sensitivity
+    Entry 27: 28692, CCSISOSensitivity
       Size: 4
-    Entry 28: 28693, Color Mode
+    Entry 28: 28693, ColorMode
       Size: 2
     Entry 29: 28694, Enhancement
       Size: 2

diff --git a/test/testdata/pentax_makernote_variant_3.jpg.parsed b/test/testdata/pentax_makernote_variant_3.jpg.parsed
index d0a6d95..65021cd 100644 (file)
--- a/test/testdata/pentax_makernote_variant_3.jpg.parsed
+++ b/test/testdata/pentax_makernote_variant_3.jpg.parsed
@@ -137,59 +137,59 @@ File pentax_makernote_variant_3.jpg
       Size, Comps: 4, 4
       Value: 0100
   MakerNote
-    Entry 0: 16385, Capture Mode
+    Entry 0: 16385, Mode
       Size: 6
-    Entry 1: 16386, Preview Size
+    Entry 1: 16386, PentaxPreviewSize
       Size: 8
-    Entry 2: 16387, Preview Length
+    Entry 2: 16387, PentaxPreviewLength
       Size: 2
-    Entry 3: 16388, Preview Start
+    Entry 3: 16388, PentaxPreviewStart
       Size: 5
-    Entry 4: 16389, Model Identification
+    Entry 4: 16389, ModelID
       Size: 6
     Entry 5: 16390, Date
       Size: 10
     Entry 6: 16391, Time
       Size: 8
-    Entry 7: 16392, Quality Level
+    Entry 7: 16392, Quality
       Size: 4
-    Entry 8: 16393, Image Size
+    Entry 8: 16393, ImageSize
       Size: 7
-    Entry 9: 16395, Picture Mode
+    Entry 9: 16395, PictureMode
       Size: 33
-    Entry 10: 16396, Flash Mode
+    Entry 10: 16396, FlashMode
       Size: 3
-    Entry 11: 16397, Focus Mode
+    Entry 11: 16397, FocusMode
       Size: 6
-    Entry 12: 16398, AF Point Selected
+    Entry 12: 16398, AFPointSelected
       Size: 4
-    Entry 13: 16399, Auto AF Point
+    Entry 13: 16399, AutoAFPoint
       Size: 8
-    Entry 14: 16400, Focus Position
+    Entry 14: 16400, FocusPosition
       Size: 5
-    Entry 15: 16402, Exposure Time
+    Entry 15: 16402, ExposureTime
       Size: 7
-    Entry 16: 16403, F-Number
+    Entry 16: 16403, FNumber
       Size: 3
-    Entry 17: 16404, ISO Number
+    Entry 17: 16404, ISO
       Size: 2
     Entry 18: 16405, (unknown)
       Size: 6
-    Entry 19: 16406, Exposure Compensation
+    Entry 19: 16406, ExposureCompensation
       Size: 3
-    Entry 20: 16407, Metering Mode
+    Entry 20: 16407, MeteringMode
       Size: 2
-    Entry 21: 16408, Auto Bracketing
+    Entry 21: 16408, AutoBracketing
       Size: 2
-    Entry 22: 16409, White Balance
+    Entry 22: 16409, WhiteBalance
       Size: 4
-    Entry 23: 16411, Blue Balance
+    Entry 23: 16411, BlueBalance
       Size: 2
-    Entry 24: 16412, Red Balance
+    Entry 24: 16412, RedBalance
       Size: 2
-    Entry 25: 16413, Focal Length
+    Entry 25: 16413, FocalLength
       Size: 3
-    Entry 26: 16414, Digital Zoom
+    Entry 26: 16414, DigitalZoom
       Size: 4
     Entry 27: 16415, Saturation
       Size: 2
@@ -197,21 +197,21 @@ File pentax_makernote_variant_3.jpg
       Size: 2
     Entry 29: 16417, Sharpness
       Size: 2
-    Entry 30: 16418, World Time Location
+    Entry 30: 16418, WorldTimeLocation
       Size: 2
-    Entry 31: 16419, Hometown City
+    Entry 31: 16419, HometownCity
       Size: 3
-    Entry 32: 16420, Destination City
+    Entry 32: 16420, DestinationCity
       Size: 3
-    Entry 33: 16421, Hometown DST
+    Entry 33: 16421, HometownDST,
       Size: 2
-    Entry 34: 16422, Destination DST
+    Entry 34: 16422, DestinationDST
       Size: 2
     Entry 35: 16423, (unknown)
       Size: 20
-    Entry 36: 16425, Frame Number
+    Entry 36: 16425, FrameNumber
       Size: 2
-    Entry 37: 16434, Image Processing
+    Entry 37: 16434, ImageProcessing
       Size: 20
     Entry 38: 16449, (unknown)
       Size: 2

diff --git a/test/testdata/pentax_makernote_variant_4.jpg.parsed b/test/testdata/pentax_makernote_variant_4.jpg.parsed
index 2ea197c..ed2c385 100644 (file)
--- a/test/testdata/pentax_makernote_variant_4.jpg.parsed
+++ b/test/testdata/pentax_makernote_variant_4.jpg.parsed
@@ -146,15 +146,15 @@ File pentax_makernote_variant_4.jpg
       Size, Comps: 4, 4
       Value: 0100
   MakerNote
-    Entry 0: 16386, Preview Size
+    Entry 0: 16386, PentaxPreviewSize
       Size: 8
-    Entry 1: 16387, Preview Length
+    Entry 1: 16387, PentaxPreviewLength
       Size: 2
-    Entry 2: 16388, Preview Start
+    Entry 2: 16388, PentaxPreviewStart
       Size: 5
-    Entry 3: 16389, Model Identification
+    Entry 3: 16389, ModelID
       Size: 5
-    Entry 4: 24576, Preview Start
+    Entry 4: 24576, CasioPreviewStart
       Size: 20
     Entry 5: 24577, (unknown)
       Size: 4
@@ -168,9 +168,9 @@ File pentax_makernote_variant_4.jpg
       Size: 2
     Entry 10: 24582, (unknown)
       Size: 20
-    Entry 11: 24593, White Balance Bias
+    Entry 11: 24593, WhiteBalanceBias
       Size: 8
-    Entry 12: 24594, White Balance
+    Entry 12: 24594, WhiteBalance
       Size: 3
     Entry 13: 24595, (unknown)
       Size: 2
@@ -178,7 +178,7 @@ File pentax_makernote_variant_4.jpg
       Size: 21
     Entry 15: 24609, (unknown)
       Size: 24
-    Entry 16: 24610, Object Distance
+    Entry 16: 24610, ObjectDistance
       Size: 5
     Entry 17: 24611, (unknown)
       Size: 2
@@ -188,7 +188,7 @@ File pentax_makernote_variant_4.jpg
       Size: 20
     Entry 20: 24627, (unknown)
       Size: 2
-    Entry 21: 24628, Flash Distance
+    Entry 21: 24628, FlashDistance
       Size: 4
     Entry 22: 24629, (unknown)
       Size: 4
@@ -368,19 +368,19 @@ File pentax_makernote_variant_4.jpg
       Size: 21
     Entry 110: 24769, (unknown)
       Size: 21
-    Entry 111: 28672, Record Mode
+    Entry 111: 28672, RecordMode
       Size: 2
-    Entry 112: 28673, Self-timer
+    Entry 112: 28673, SelfTimer
       Size: 2
-    Entry 113: 28674, Quality Level
+    Entry 113: 28674, CasioQuality
       Size: 2
-    Entry 114: 28675, Focus Mode
+    Entry 114: 28675, CasioFocusMode
       Size: 2
     Entry 115: 28677, (unknown)
       Size: 4
-    Entry 116: 28678, Time Zone
+    Entry 116: 28678, TimeZone
       Size: 6
-    Entry 117: 28679, Bestshot Mode
+    Entry 117: 28679, BestshotMode
       Size: 2
     Entry 118: 28680, (unknown)
       Size: 2
@@ -394,9 +394,9 @@ File pentax_makernote_variant_4.jpg
       Size: 20
     Entry 123: 28691, (unknown)
       Size: 20
-    Entry 124: 28692, CCS ISO Sensitivity
+    Entry 124: 28692, CCSISOSensitivity
       Size: 4
-    Entry 125: 28693, Color Mode
+    Entry 125: 28693, ColorMode
       Size: 2
     Entry 126: 28694, Enhancement
       Size: 2