From ba233e41b70e24131a3106ff0d77fa13762a2fd7 Mon Sep 17 00:00:00 2001
From: Stefan Oltmann <github@stefan-oltmann.de>
Date: Fri, 26 Jan 2024 16:48:09 +0100
Subject: [PATCH] Support for displaying MakerNote in Exif View

---
 app/src/commonMain/kotlin/HtmlGenerator.kt  | 7 ++++++-
 app/src/jvmTest/resources/photo_1_exif.html | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/commonMain/kotlin/HtmlGenerator.kt b/app/src/commonMain/kotlin/HtmlGenerator.kt
index 4da5b56..ca25e9d 100644
--- a/app/src/commonMain/kotlin/HtmlGenerator.kt
+++ b/app/src/commonMain/kotlin/HtmlGenerator.kt
@@ -79,7 +79,12 @@ fun ImageMetadata.toExifHtmlString(): String =
         append("<th>Value</th>")
         append("</tr>")
 
-        for (directory in exif!!.directories) {
+        val mergedDirectories = if (exif!!.makerNoteDirectory != null)
+            exif!!.directories + exif!!.makerNoteDirectory!!
+        else
+            exif!!.directories
+
+        for (directory in mergedDirectories) {
 
             val directoryDescription = TiffDirectory.description(directory.type)
 
diff --git a/app/src/jvmTest/resources/photo_1_exif.html b/app/src/jvmTest/resources/photo_1_exif.html
index 3c03e9f..819571d 100644
--- a/app/src/jvmTest/resources/photo_1_exif.html
+++ b/app/src/jvmTest/resources/photo_1_exif.html
@@ -1 +1 @@
-<table><tr><th>Directory</th><th>Tag</th><th>Name</th><th>Value</th></tr><tr><td>IFD0</td><td>0x010f</td><td>Make</td><td>Canon</td></tr><tr><td>IFD0</td><td>0x0110</td><td>Model</td><td>Canon EOS 70D</td></tr><tr><td>IFD0</td><td>0x0112</td><td>Orientation</td><td>1</td></tr><tr><td>IFD0</td><td>0x011a</td><td>XResolution</td><td>300/1 (300.0)</td></tr><tr><td>IFD0</td><td>0x011b</td><td>YResolution</td><td>300/1 (300.0)</td></tr><tr><td>IFD0</td><td>0x0128</td><td>ResolutionUnit</td><td>2</td></tr><tr><td>IFD0</td><td>0x0131</td><td>Software</td><td>darktable 2.6.2</td></tr><tr><td>IFD0</td><td>0x0132</td><td>ModifyDate</td><td>2019:07:15 20:09:19</td></tr><tr><td>IFD0</td><td>0x013b</td><td>Artist</td><td>dxfoto.ru</td></tr><tr><td>IFD0</td><td>0x4746</td><td>Rating</td><td>0</td></tr><tr><td>IFD0</td><td>0x4749</td><td>RatingPercent</td><td>0</td></tr><tr><td>IFD0</td><td>0x8298</td><td>Copyright</td><td>CC-BY 3.0</td></tr><tr><td>IFD0</td><td>0x8769</td><td>ExifOffset</td><td>306</td></tr><tr><td>IFD0</td><td>0x8825</td><td>GPSInfo</td><td>6526</td></tr><tr><td>IFD0</td><td>0x9003</td><td>Unknown</td><td>2019:07:14 09:21:11</td></tr><tr><td>ExifIFD</td><td>0x829a</td><td>ExposureTime</td><td>1/400 (0.0025)</td></tr><tr><td>ExifIFD</td><td>0x829d</td><td>FNumber</td><td>71/10 (7.1)</td></tr><tr><td>ExifIFD</td><td>0x8822</td><td>ExposureProgram</td><td>1</td></tr><tr><td>ExifIFD</td><td>0x8827</td><td>ISO</td><td>250</td></tr><tr><td>ExifIFD</td><td>0x8830</td><td>SensitivityType</td><td>2</td></tr><tr><td>ExifIFD</td><td>0x8832</td><td>RecommendedExposureIndex</td><td>250</td></tr><tr><td>ExifIFD</td><td>0x9000</td><td>ExifVersion</td><td>[0x30, 0x32, 0x33, 0x30]</td></tr><tr><td>ExifIFD</td><td>0x9003</td><td>DateTimeOriginal</td><td>2019:07:14 09:21:11</td></tr><tr><td>ExifIFD</td><td>0x9004</td><td>DateTimeDigitized</td><td>2019:07:14 09:21:11</td></tr><tr><td>ExifIFD</td><td>0x9101</td><td>ComponentsConfiguration</td><td>[0x01, 0x02, 0x03, 0x00]</td></tr><tr><td>ExifIFD</td><td>0x9201</td><td>ShutterSpeedValue</td><td>565248/65536 (8.625)</td></tr><tr><td>ExifIFD</td><td>0x9202</td><td>ApertureValue</td><td>368640/65536 (5.625)</td></tr><tr><td>ExifIFD</td><td>0x9204</td><td>ExposureCompensation</td><td>0/1 (0.0)</td></tr><tr><td>ExifIFD</td><td>0x9207</td><td>MeteringMode</td><td>5</td></tr><tr><td>ExifIFD</td><td>0x9209</td><td>Flash</td><td>16</td></tr><tr><td>ExifIFD</td><td>0x920a</td><td>FocalLength</td><td>250/1 (250.0)</td></tr><tr><td>ExifIFD</td><td>0x927c</td><td>MakerNote</td><td>[5550 bytes]</td></tr><tr><td>ExifIFD</td><td>0x9290</td><td>SubSecTime</td><td>47</td></tr><tr><td>ExifIFD</td><td>0x9291</td><td>SubSecTimeOriginal</td><td>47</td></tr><tr><td>ExifIFD</td><td>0x9292</td><td>SubSecTimeDigitized</td><td>47</td></tr><tr><td>ExifIFD</td><td>0xa000</td><td>FlashpixVersion</td><td>[0x30, 0x31, 0x30, 0x30]</td></tr><tr><td>ExifIFD</td><td>0xa001</td><td>ColorSpace</td><td>1</td></tr><tr><td>ExifIFD</td><td>0xa002</td><td>ExifImageWidth</td><td>4000</td></tr><tr><td>ExifIFD</td><td>0xa003</td><td>ExifImageHeight</td><td>2670</td></tr><tr><td>ExifIFD</td><td>0xa005</td><td>InteropOffset</td><td>6496</td></tr><tr><td>ExifIFD</td><td>0xa20e</td><td>FocalPlaneXResolution</td><td>5472000/899 (6086.76307)</td></tr><tr><td>ExifIFD</td><td>0xa20f</td><td>FocalPlaneYResolution</td><td>3648000/599 (6090.15025)</td></tr><tr><td>ExifIFD</td><td>0xa210</td><td>FocalPlaneResolutionUnit</td><td>2</td></tr><tr><td>ExifIFD</td><td>0xa401</td><td>CustomRendered</td><td>0</td></tr><tr><td>ExifIFD</td><td>0xa402</td><td>ExposureMode</td><td>1</td></tr><tr><td>ExifIFD</td><td>0xa403</td><td>WhiteBalance</td><td>0</td></tr><tr><td>ExifIFD</td><td>0xa406</td><td>SceneCaptureType</td><td>0</td></tr><tr><td>ExifIFD</td><td>0xa430</td><td>CameraOwnerName</td><td></td></tr><tr><td>ExifIFD</td><td>0xa431</td><td>BodySerialNumber</td><td>103025021031</td></tr><tr><td>ExifIFD</td><td>0xa432</td><td>LensSpecification</td><td>[55/1 (55.0), 250/1 (250.0), 0/1 (0.0), 0/1 (0.0)]</td></tr><tr><td>ExifIFD</td><td>0xa434</td><td>LensModel</td><td>EF-S55-250mm f/4-5.6 IS STM</td></tr><tr><td>ExifIFD</td><td>0xa435</td><td>LensSerialNumber</td><td>0000800dcf</td></tr><tr><td>InteropIFD</td><td>0x0001</td><td>InteroperabilityIndex</td><td>R98</td></tr><tr><td>InteropIFD</td><td>0x0002</td><td>InteroperabilityVersion</td><td>[0x30, 0x31, 0x30, 0x30]</td></tr><tr><td>GPS</td><td>0x0000</td><td>GPSVersionID</td><td>[0x02, 0x02, 0x00, 0x00]</td></tr><tr><td>GPS</td><td>0x0001</td><td>GPSLatitudeRef</td><td>N</td></tr><tr><td>GPS</td><td>0x0002</td><td>GPSLatitude</td><td>[55/1 (55.0), 54678955/1000000 (54.678955), 0/1 (0.0)]</td></tr><tr><td>GPS</td><td>0x0003</td><td>GPSLongitudeRef</td><td>E</td></tr><tr><td>GPS</td><td>0x0004</td><td>GPSLongitude</td><td>[36/1 (36.0), 57808914/1000000 (57.808914), 0/1 (0.0)]</td></tr></table>
\ No newline at end of file
+<table><tr><th>Directory</th><th>Tag</th><th>Name</th><th>Value</th></tr><tr><td>IFD0</td><td>0x010f</td><td>Make</td><td>Canon</td></tr><tr><td>IFD0</td><td>0x0110</td><td>Model</td><td>Canon EOS 70D</td></tr><tr><td>IFD0</td><td>0x0112</td><td>Orientation</td><td>1</td></tr><tr><td>IFD0</td><td>0x011a</td><td>XResolution</td><td>300/1 (300.0)</td></tr><tr><td>IFD0</td><td>0x011b</td><td>YResolution</td><td>300/1 (300.0)</td></tr><tr><td>IFD0</td><td>0x0128</td><td>ResolutionUnit</td><td>2</td></tr><tr><td>IFD0</td><td>0x0131</td><td>Software</td><td>darktable 2.6.2</td></tr><tr><td>IFD0</td><td>0x0132</td><td>ModifyDate</td><td>2019:07:15 20:09:19</td></tr><tr><td>IFD0</td><td>0x013b</td><td>Artist</td><td>dxfoto.ru</td></tr><tr><td>IFD0</td><td>0x4746</td><td>Rating</td><td>0</td></tr><tr><td>IFD0</td><td>0x4749</td><td>RatingPercent</td><td>0</td></tr><tr><td>IFD0</td><td>0x8298</td><td>Copyright</td><td>CC-BY 3.0</td></tr><tr><td>IFD0</td><td>0x8769</td><td>ExifOffset</td><td>306</td></tr><tr><td>IFD0</td><td>0x8825</td><td>GPSInfo</td><td>6526</td></tr><tr><td>IFD0</td><td>0x9003</td><td>Unknown</td><td>2019:07:14 09:21:11</td></tr><tr><td>ExifIFD</td><td>0x829a</td><td>ExposureTime</td><td>1/400 (0.0025)</td></tr><tr><td>ExifIFD</td><td>0x829d</td><td>FNumber</td><td>71/10 (7.1)</td></tr><tr><td>ExifIFD</td><td>0x8822</td><td>ExposureProgram</td><td>1</td></tr><tr><td>ExifIFD</td><td>0x8827</td><td>ISO</td><td>250</td></tr><tr><td>ExifIFD</td><td>0x8830</td><td>SensitivityType</td><td>2</td></tr><tr><td>ExifIFD</td><td>0x8832</td><td>RecommendedExposureIndex</td><td>250</td></tr><tr><td>ExifIFD</td><td>0x9000</td><td>ExifVersion</td><td>[0x30, 0x32, 0x33, 0x30]</td></tr><tr><td>ExifIFD</td><td>0x9003</td><td>DateTimeOriginal</td><td>2019:07:14 09:21:11</td></tr><tr><td>ExifIFD</td><td>0x9004</td><td>DateTimeDigitized</td><td>2019:07:14 09:21:11</td></tr><tr><td>ExifIFD</td><td>0x9101</td><td>ComponentsConfiguration</td><td>[0x01, 0x02, 0x03, 0x00]</td></tr><tr><td>ExifIFD</td><td>0x9201</td><td>ShutterSpeedValue</td><td>565248/65536 (8.625)</td></tr><tr><td>ExifIFD</td><td>0x9202</td><td>ApertureValue</td><td>368640/65536 (5.625)</td></tr><tr><td>ExifIFD</td><td>0x9204</td><td>ExposureCompensation</td><td>0/1 (0.0)</td></tr><tr><td>ExifIFD</td><td>0x9207</td><td>MeteringMode</td><td>5</td></tr><tr><td>ExifIFD</td><td>0x9209</td><td>Flash</td><td>16</td></tr><tr><td>ExifIFD</td><td>0x920a</td><td>FocalLength</td><td>250/1 (250.0)</td></tr><tr><td>ExifIFD</td><td>0x927c</td><td>MakerNote</td><td>[5550 bytes]</td></tr><tr><td>ExifIFD</td><td>0x9290</td><td>SubSecTime</td><td>47</td></tr><tr><td>ExifIFD</td><td>0x9291</td><td>SubSecTimeOriginal</td><td>47</td></tr><tr><td>ExifIFD</td><td>0x9292</td><td>SubSecTimeDigitized</td><td>47</td></tr><tr><td>ExifIFD</td><td>0xa000</td><td>FlashpixVersion</td><td>[0x30, 0x31, 0x30, 0x30]</td></tr><tr><td>ExifIFD</td><td>0xa001</td><td>ColorSpace</td><td>1</td></tr><tr><td>ExifIFD</td><td>0xa002</td><td>ExifImageWidth</td><td>4000</td></tr><tr><td>ExifIFD</td><td>0xa003</td><td>ExifImageHeight</td><td>2670</td></tr><tr><td>ExifIFD</td><td>0xa005</td><td>InteropOffset</td><td>6496</td></tr><tr><td>ExifIFD</td><td>0xa20e</td><td>FocalPlaneXResolution</td><td>5472000/899 (6086.76307)</td></tr><tr><td>ExifIFD</td><td>0xa20f</td><td>FocalPlaneYResolution</td><td>3648000/599 (6090.15025)</td></tr><tr><td>ExifIFD</td><td>0xa210</td><td>FocalPlaneResolutionUnit</td><td>2</td></tr><tr><td>ExifIFD</td><td>0xa401</td><td>CustomRendered</td><td>0</td></tr><tr><td>ExifIFD</td><td>0xa402</td><td>ExposureMode</td><td>1</td></tr><tr><td>ExifIFD</td><td>0xa403</td><td>WhiteBalance</td><td>0</td></tr><tr><td>ExifIFD</td><td>0xa406</td><td>SceneCaptureType</td><td>0</td></tr><tr><td>ExifIFD</td><td>0xa430</td><td>CameraOwnerName</td><td></td></tr><tr><td>ExifIFD</td><td>0xa431</td><td>BodySerialNumber</td><td>103025021031</td></tr><tr><td>ExifIFD</td><td>0xa432</td><td>LensSpecification</td><td>[55/1 (55.0), 250/1 (250.0), 0/1 (0.0), 0/1 (0.0)]</td></tr><tr><td>ExifIFD</td><td>0xa434</td><td>LensModel</td><td>EF-S55-250mm f/4-5.6 IS STM</td></tr><tr><td>ExifIFD</td><td>0xa435</td><td>LensSerialNumber</td><td>0000800dcf</td></tr><tr><td>InteropIFD</td><td>0x0001</td><td>InteroperabilityIndex</td><td>R98</td></tr><tr><td>InteropIFD</td><td>0x0002</td><td>InteroperabilityVersion</td><td>[0x30, 0x31, 0x30, 0x30]</td></tr><tr><td>GPS</td><td>0x0000</td><td>GPSVersionID</td><td>[0x02, 0x02, 0x00, 0x00]</td></tr><tr><td>GPS</td><td>0x0001</td><td>GPSLatitudeRef</td><td>N</td></tr><tr><td>GPS</td><td>0x0002</td><td>GPSLatitude</td><td>[55/1 (55.0), 54678955/1000000 (54.678955), 0/1 (0.0)]</td></tr><tr><td>GPS</td><td>0x0003</td><td>GPSLongitudeRef</td><td>E</td></tr><tr><td>GPS</td><td>0x0004</td><td>GPSLongitude</td><td>[36/1 (36.0), 57808914/1000000 (57.808914), 0/1 (0.0)]</td></tr><tr><td>MakerNoteCanon</td><td>0x0001</td><td>CanonCameraSettings</td><td>[98, 2, 0, 4, 0, 0, 0, 0, 0, 7, 0, 1, 0, 0, 0, 32767, 32767, 3, 2, 0, 4, -1, 4148, 250, 55, 1, 160, 320, 0, 0, 0, 0, -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, 0, 32767, -1, -1, 0, 0, 3]</td></tr><tr><td>MakerNoteCanon</td><td>0x0004</td><td>Unknown</td><td>[68, 0, 204, 212, 180, 276, 0, 0, 3, 0, 8, 8, 152, 0, 0, 0, 0, 0, 1, 0, 0, 180, 276, 145, 0, 0, 248, -1, -1, -1, -1, 0, 0, 0]</td></tr><tr><td>MakerNoteCanon</td><td>0x0035</td><td>Unknown</td><td>[16, 180, 17, 0]</td></tr><tr><td>MakerNoteCanon</td><td>0x0093</td><td>Unknown</td><td>[64, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, -1, -1, 105, -1, 0, 0, 90, 85, 0, 0, 0, 0, -1, 0, 0, 63, -1, -1]</td></tr><tr><td>MakerNoteCanon</td><td>0x00a0</td><td>Unknown</td><td>[28, 0, 0, 0, 0, 0, 0, 0, -1, 2600, 132, 0, 0, 0]</td></tr><tr><td>MakerNoteCanon</td><td>0x0002</td><td>Unknown</td><td>[0, 250, 2838, 23076]</td></tr><tr><td>MakerNoteCanon</td><td>0x0003</td><td>Unknown</td><td>[0, 0, 0, 0]</td></tr><tr><td>MakerNoteCanon</td><td>0x0006</td><td>Unknown</td><td>Canon EOS 70D</td></tr><tr><td>MakerNoteCanon</td><td>0x0007</td><td>Unknown</td><td>Firmware Version 1.1.2</td></tr><tr><td>MakerNoteCanon</td><td>0x0009</td><td>OwnerName</td><td></td></tr><tr><td>MakerNoteCanon</td><td>0x000d</td><td>Unknown</td><td>[1536 bytes]</td></tr><tr><td>MakerNoteCanon</td><td>0x000f</td><td>Unknown</td><td>[464, 3, 1, 84, 6, 257, 1, 0, 258, 1, 0, 260, 1, 0, 261, 1, 0, 262, 2, 3, 0, 264, 1, 0, 3, 228, 13, 1282, 1, 0, 1304, 1, 0, 1305, 1, 0, 1306, 1, 0, 1294, 1, 0, 1285, 1, 0, 1298, 2, 0, 7, 1307, 1, 0, 1302, 1, 0, 1299, 1, 0, 1292, 1, 0, 1296, 1, 0, 1287, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 132, 4, 1798, 1, 0, 1807, 2, 0, 2, 1034, 1, 3, 1804, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]</td></tr><tr><td>MakerNoteCanon</td><td>0x0010</td><td>Unknown</td><td>-2147482843</td></tr><tr><td>MakerNoteCanon</td><td>0x0013</td><td>Unknown</td><td>[0, 159, 7, 112]</td></tr><tr><td>MakerNoteCanon</td><td>0x0019</td><td>Unknown</td><td>1</td></tr><tr><td>MakerNoteCanon</td><td>0x0026</td><td>Unknown</td><td>[278, 2, 31, 19, 5472, 3648, 5472, 3648, 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1395, -897, -897, -897, -399, -399, -399, 0, 0, 0, 0, 0, 399, 399, 399, 897, 897, 897, 1395, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 401, 0, -401, 401, 0, -401, 755, 401, 0, -401, -755, 401, 0, -401, 401, 0, -401, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 512, 0, 512, 0, 0, 0, -1]</td></tr><tr><td>MakerNoteCanon</td><td>0x0095</td><td>Unknown</td><td>EF-S55-250mm f/4-5.6 IS STM</td></tr><tr><td>MakerNoteCanon</td><td>0x0096</td><td>Unknown</td><td>FA1065286</td></tr><tr><td>MakerNoteCanon</td><td>0x0097</td><td>Unknown</td><td>[1024 bytes]</td></tr><tr><td>MakerNoteCanon</td><td>0x0098</td><td>Unknown</td><td>[0, 0, 0, 0]</td></tr><tr><td>MakerNoteCanon</td><td>0x009a</td><td>Unknown</td><td>[0, 5472, 3648, 0, 0]</td></tr><tr><td>MakerNoteCanon</td><td>0x00aa</td><td>Unknown</td><td>[12, 747, 1024, 1024, 273, 0]</td></tr><tr><td>MakerNoteCanon</td><td>0x00d0</td><td>Unknown</td><td>0</td></tr><tr><td>MakerNoteCanon</td><td>0x00e0</td><td>Unknown</td><td>[34, 5568, 3708, 1, 1, 84, 50, 5555, 3697, 0, 0, 0, 0, 0, 0, 0, 0]</td></tr><tr><td>MakerNoteCanon</td><td>0x4008</td><td>Unknown</td><td>[135, 135, 135]</td></tr><tr><td>MakerNoteCanon</td><td>0x4009</td><td>Unknown</td><td>[0, 0, 0]</td></tr><tr><td>MakerNoteCanon</td><td>0x4010</td><td>Unknown</td><td></td></tr><tr><td>MakerNoteCanon</td><td>0x4011</td><td>Unknown</td><td>[252 bytes]</td></tr><tr><td>MakerNoteCanon</td><td>0x4012</td><td>Unknown</td><td></td></tr><tr><td>MakerNoteCanon</td><td>0x4013</td><td>Unknown</td><td>[44, 0, 0, 10, -1, 0, 10, 0, 10, 0, 10]</td></tr><tr><td>MakerNoteCanon</td><td>0x4015</td><td>Unknown</td><td>[456 bytes]</td></tr><tr><td>MakerNoteCanon</td><td>0x4016</td><td>Unknown</td><td>[28, 0, 1, 0, 0, 1, 1]</td></tr><tr><td>MakerNoteCanon</td><td>0x4018</td><td>Unknown</td><td>[28, 0, 3, 0, 0, 3, 1]</td></tr><tr><td>MakerNoteCanon</td><td>0x4019</td><td>Unknown</td><td>[30 bytes]</td></tr><tr><td>MakerNoteCanon</td><td>0x4020</td><td>Unknown</td><td>[28, 0, 0, 0, 0, 2147483647, 0]</td></tr><tr><td>MakerNoteCanon</td><td>0x4021</td><td>Unknown</td><td>[20, 0, 0, 0, 1]</td></tr><tr><td>MakerNoteCanon</td><td>0x4024</td><td>Unknown</td><td>[212, 7, 1, 20, 1, 257, 1, -1, 2, 20, 1, 513, 1, -1, 3, 20, 1, 769, 1, -1, 4, 56, 4, 1025, 1, -1, 1026, 1, 0, 1027, 1, 0, 1028, 1, 0, 5, 20, 1, 1281, 1, -1, 6, 20, 1, 1537, 1, -1, 7, 20, 1, 1793, 1, -1]</td></tr><tr><td>MakerNoteCanon</td><td>0x4025</td><td>Unknown</td><td>[36, 0, 0, 0, 0, 0, 0, 0, 0]</td></tr><tr><td>MakerNoteCanon</td><td>0x4027</td><td>Unknown</td><td>[24, 524550, -1325400014, 134217728, 13684944, 65538]</td></tr></table>
\ No newline at end of file