aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tiff-tables.db25
-rw-r--r--tools/info.h47
2 files changed, 25 insertions, 47 deletions
diff --git a/tiff-tables.db b/tiff-tables.db
index 8a56666..341c36e 100644
--- a/tiff-tables.db
+++ b/tiff-tables.db
@@ -35,6 +35,9 @@
#
# Digital Negative (DNG) Specification 1.5.0.0 (2019)
# https://www.adobe.com/content/dam/acom/en/products/photoshop/pdfs/dng_spec_1.5.0.0.pdf
+#
+# CIPA DC-007-2021 (Multi-Picture Format)
+# https://www.cipa.jp/e/std/std-sec.html
# TIFF 6.0
= TIFF
@@ -444,3 +447,25 @@
# Exif 2.3 4.6.7 (Notice it starts at 1, and collides with GPS.)
= Exif Interoperability
1, InteroperabilityIndex
+
+# CIPA DC-007-2021 5.2.3., 5.2.4. (But derive "field names" from "tag names".)
+= MPF
+45056, MP Format Version Number # MPFVersion
+45057, Number of Images # NumberOfImages
+45058, MP Entry # MPEntry
+45059, Individual Image Unique ID List # ImageUIDList
+45060, Total Number of Captured Frames # TotalFrames
+45313, MP Individual Image Number # MPIndividualNum
+45569, Panorama Scanning Orientation # PanOrientation
+45570, Panorama Horizontal Overlap # PanOverlap_H
+45571, Panorama Vertical Overlap # PanOverlap_V
+45572, Base Viewpoint Number # BaseViewpointNum
+45573, Convergence Angle # ConvergenceAngle
+45574, Baseline Length # BaselineLength
+45575, Divergence Angle # VerticalDivergence
+45576, Horizontal Axis Distance # AxisDistance_X
+45577, Vertical Axis Distance # AxisDistance_Y
+45578, Collimation Axis Distance # AxisDistance_Z
+45579, Yaw Angle # YawAngle
+45580, Pitch Angle # PitchAngle
+45581, Roll Angle # RollAngle
diff --git a/tools/info.h b/tools/info.h
index e28d153..d62f0d5 100644
--- a/tools/info.h
+++ b/tools/info.h
@@ -631,53 +631,6 @@ parse_icc(jv o, const uint8_t *profile, size_t profile_len)
// --- Multi-Picture Format ----------------------------------------------------
-enum {
- MPF_MPFVersion = 45056,
- MPF_NumberOfImages = 45057,
- MPF_MPEntry = 45058,
- MPF_ImageUIDList = 45059,
- MPF_TotalFrames = 45060,
-
- MPF_MPIndividualNum = 45313,
- MPF_PanOrientation = 45569,
- MPF_PanOverlap_H = 45570,
- MPF_PanOverlap_V = 45571,
- MPF_BaseViewpointNum = 45572,
- MPF_ConvergenceAngle = 45573,
- MPF_BaselineLength = 45574,
- MPF_VerticalDivergence = 45575,
- MPF_AxisDistance_X = 45576,
- MPF_AxisDistance_Y = 45577,
- MPF_AxisDistance_Z = 45578,
- MPF_YawAngle = 45579,
- MPF_PitchAngle = 45580,
- MPF_RollAngle = 45581
-};
-
-static struct tiff_entry mpf_entries[] = {
- {"MP Format Version Number", MPF_MPFVersion, NULL},
- {"Number of Images", MPF_NumberOfImages, NULL},
- {"MP Entry", MPF_MPEntry, NULL},
- {"Individual Image Unique ID List", MPF_ImageUIDList, NULL},
- {"Total Number of Captured Frames", MPF_TotalFrames, NULL},
-
- {"MP Individual Image Number", MPF_MPIndividualNum, NULL},
- {"Panorama Scanning Orientation", MPF_PanOrientation, NULL},
- {"Panorama Horizontal Overlap", MPF_PanOverlap_H, NULL},
- {"Panorama Vertical Overlap", MPF_PanOverlap_V, NULL},
- {"Base Viewpoint Number", MPF_BaseViewpointNum, NULL},
- {"Convergence Angle", MPF_ConvergenceAngle, NULL},
- {"Baseline Length", MPF_BaselineLength, NULL},
- {"Divergence Angle", MPF_VerticalDivergence, NULL},
- {"Horizontal Axis Distance", MPF_AxisDistance_X, NULL},
- {"Vertical Axis Distance", MPF_AxisDistance_Y, NULL},
- {"Collimation Axis Distance", MPF_AxisDistance_Z, NULL},
- {"Yaw Angle", MPF_YawAngle, NULL},
- {"Pitch Angle", MPF_PitchAngle, NULL},
- {"Roll Angle", MPF_RollAngle, NULL},
- {}
-};
-
static uint32_t
parse_mpf_mpentry(jv *a, const uint8_t *p, const struct tiffer *T)
{