Skip to content

Commit d8b4e53

Browse files
norbertwgnorbertwg
committed
Merge branch 'main' of https://github.com/norbertwg/exiv2 
2 parents 203722b + e8326ba commit d8b4e53

31 files changed

+55
-32
lines changed

‎.github/workflows/on_PR_meson.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,12 @@ jobs:
146146
meson compile -C "${{github.workspace}}/build"
147147
meson test -C "${{github.workspace}}/build"
148148
FreeBSD:
149-
runs-on: macos-latest
149+
runs-on: ubuntu-latest
150150
name: FreeBSD
151151
steps:
152152
- uses: actions/checkout@v4
153153
- name: FreeBSD
154-
uses: vmactions/freebsd-vm@v0
154+
uses: vmactions/freebsd-vm@v1
155155
with:
156156
prepare: |
157157
pkg install -y cmake curl ninja meson gettext pkgconf googletest expat inih brotli

‎src/nikonmn_int.cpp‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -744,6 +744,28 @@ constexpr TagDetails nikonAfAreaMode[] = {
744744
{3, N_("Group Dynamic")}, {4, N_("Single Area (wide)")}, {5, N_("Dynamic Area (wide)")},
745745
};
746746

747+
//! AF2 Area Mode
748+
constexpr TagDetails nikonAf2AreaMode[] = {
749+
{0, N_("Single-point AF")},
750+
{1, N_("Dynamic-area AF")},
751+
{2, N_("Closest Subject")},
752+
{3, N_("Group Dynamic AF")},
753+
{4, N_("Dynamic-area AF (9 points)")},
754+
{5, N_("Dynamic-area AF (21 points)")},
755+
{6, N_("Dynamic-area AF (51 points)")},
756+
{7, N_("Dynamic-area AF (51 points), 3D-tracking")},
757+
{8, N_("Auto-area AF")},
758+
{9, N_("3D-tracking")},
759+
{10, N_("Single Area AF, Wide")},
760+
{11, N_("Dynamic-area AF, Wide")},
761+
{12, N_("3D-tracking/Wide")},
762+
{13, N_("Group-area AF")},
763+
{14, N_("Dynamic-area AF (25 points)")},
764+
{15, N_("Dynamic-area AF (72 points)")},
765+
{16, N_("Group-area AF (HL)")},
766+
{17, N_("Group-area AF (VL)")},
767+
};
768+
747769
//! AfPoint
748770
constexpr TagDetails nikonAfPoint[] = {
749771
{0, N_("Center")}, {1, N_("Top")}, {2, N_("Bottom")}, {3, N_("Mid-left")},
@@ -788,7 +810,7 @@ constexpr TagInfo Nikon3MakerNote::tagInfoAf21_[] = {
788810
{4, "ContrastDetectAF", N_("Contrast Detect AF"), N_("Contrast detect AF"), IfdId::nikonAf21Id,
789811
SectionId::makerTags, unsignedByte, 1, EXV_PRINT_TAG(nikonOffOn)},
790812
{5, "AFAreaMode", N_("AF Area Mode"), N_("AF area mode"), IfdId::nikonAf21Id, SectionId::makerTags, unsignedByte, 1,
791-
printValue},
813+
EXV_PRINT_TAG(nikonAf2AreaMode)},
792814
{6, "PhaseDetectAF", N_("Phase Detect AF"), N_("Phase detect AF"), IfdId::nikonAf21Id, SectionId::makerTags,
793815
unsignedByte, 1, EXV_PRINT_TAG(nikonPhaseDetectAF)},
794816
{7, "PrimaryAFPoint", N_("Primary AF Point"), N_("Primary AF point"), IfdId::nikonAf21Id, SectionId::makerTags,
@@ -3957,6 +3979,7 @@ std::ostream& Nikon3MakerNote::printLensId4ZMount(std::ostream& os, const Value&
39573979
{45, "Nikon", "Nikkor Z 600mm f/6.3 VR S"},
39583980
{46, "Nikon", "Nikkor Z 135mm f/1.8 S Plena"},
39593981
{53251, "Sigma", "56mm F1.4 DC DN | C"},
3982+
{57346, "Tamron", "35-150mm F/2-2.8 Di III VXD"},
39603983
};
39613984

39623985
auto lid = static_cast<uint16_t>(value.toInt64());

‎test/data/test_reference_files/Sigma_20mm_F1.4_DG_HSM_A.exv.out‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ Exif.NikonMe.MultiExposureAutoGain Long 1 0 Off
137137
Exif.Nikon3.HighISONoiseReduction Short 1 4 Normal
138138
Exif.NikonAf2.Version Undefined 4 48 49 48 48 1.00
139139
Exif.NikonAf2.ContrastDetectAF Byte 1 0 Off
140-
Exif.NikonAf2.AFAreaMode Byte 1 0 0
140+
Exif.NikonAf2.AFAreaMode Byte 1 0 Single-point AF
141141
Exif.NikonAf2.PhaseDetectAF Byte 1 0 Off
142142
Exif.NikonAf2.PrimaryAFPoint Byte 1 0 0
143143
Exif.NikonAf2.AFPointsUsed Byte 7 0 0 0 0 0 0 0 0 0 0 0 0 0 0

‎test/data/test_reference_files/Sigma_50mm_F1.4_DG_HSM_A.exv.out‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ Exif.NikonMe.MultiExposureAutoGain Long 1 0 Off
137137
Exif.Nikon3.HighISONoiseReduction Short 1 4 Normal
138138
Exif.NikonAf2.Version Undefined 4 48 49 48 48 1.00
139139
Exif.NikonAf2.ContrastDetectAF Byte 1 0 Off
140-
Exif.NikonAf2.AFAreaMode Byte 1 0 0
140+
Exif.NikonAf2.AFAreaMode Byte 1 0 Single-point AF
141141
Exif.NikonAf2.PhaseDetectAF Byte 1 0 Off
142142
Exif.NikonAf2.PrimaryAFPoint Byte 1 0 0
143143
Exif.NikonAf2.AFPointsUsed Byte 7 0 0 0 0 0 0 0 0 0 0 0 0 0 0

‎test/data/test_reference_files/Sigma_APO_MACRO_180_F3.5_EX_DG_HSM.exv.out‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ Exif.NikonMe.MultiExposureAutoGain Long 1 0 Off
148148
Exif.Nikon3.HighISONoiseReduction Short 1 0 Off
149149
Exif.NikonAf2.Version Undefined 4 48 49 48 48 1.00
150150
Exif.NikonAf2.ContrastDetectAF Byte 1 0 Off
151-
Exif.NikonAf2.AFAreaMode Byte 1 0 0
151+
Exif.NikonAf2.AFAreaMode Byte 1 0 Single-point AF
152152
Exif.NikonAf2.PhaseDetectAF Byte 1 0 Off
153153
Exif.NikonAf2.PrimaryAFPoint Byte 1 0 0
154154
Exif.NikonAf2.AFPointsUsed Byte 7 0 0 0 0 0 0 0 0 0 0 0 0 0 0

‎test/data/test_reference_files/Stonehenge.exv.out‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ Exif.NikonMe.MultiExposureAutoGain Long 1 0 Off
127127
Exif.Nikon3.HighISONoiseReduction Short 1 4 Normal
128128
Exif.NikonAf2.Version Undefined 4 48 49 48 48 1.00
129129
Exif.NikonAf2.ContrastDetectAF Byte 1 0 Off
130-
Exif.NikonAf2.AFAreaMode Byte 1 8 8
130+
Exif.NikonAf2.AFAreaMode Byte 1 8 Auto-area AF
131131
Exif.NikonAf2.PhaseDetectAF Byte 1 3 On (39-point)
132132
Exif.NikonAf2.PrimaryAFPoint Byte 1 11 11
133133
Exif.NikonAf2.AFPointsUsed Byte 7 105 5 128 0 16 0 0 105 5 128 0 16 0 0

‎test/data/test_reference_files/Tamron_SP70-300_F4-5.6_Di_VC_USD_A030.exv.out‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ Exif.NikonMe.MultiExposureAutoGain Long 1 0 Off
130130
Exif.Nikon3.HighISONoiseReduction Short 1 0 Off
131131
Exif.NikonAf2.Version Undefined 4 48 49 48 48 1.00
132132
Exif.NikonAf2.ContrastDetectAF Byte 1 0 Off
133-
Exif.NikonAf2.AFAreaMode Byte 1 0 0
133+
Exif.NikonAf2.AFAreaMode Byte 1 0 Single-point AF
134134
Exif.NikonAf2.PhaseDetectAF Byte 1 0 Off
135135
Exif.NikonAf2.PrimaryAFPoint Byte 1 0 0
136136
Exif.NikonAf2.AFPointsUsed Byte 7 0 0 0 0 0 0 0 0 0 0 0 0 0 0

‎test/data/test_reference_files/Tamron_SP_24-70mm_F2.8_Di_VC_USD_G2_0E.exv.out‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ Exif.NikonMe.MultiExposureAutoGain Long 1 0 Off
130130
Exif.Nikon3.HighISONoiseReduction Short 1 6 High
131131
Exif.NikonAf2.Version Undefined 4 48 49 48 48 1.00
132132
Exif.NikonAf2.ContrastDetectAF Byte 1 0 Off
133-
Exif.NikonAf2.AFAreaMode Byte 1 5 5
133+
Exif.NikonAf2.AFAreaMode Byte 1 5 Dynamic-area AF (21 points)
134134
Exif.NikonAf2.PhaseDetectAF Byte 1 3 On (39-point)
135135
Exif.NikonAf2.PrimaryAFPoint Byte 1 1 1
136136
Exif.NikonAf2.AFPointsUsed Byte 7 1 0 0 0 0 0 0 1 0 0 0 0 0 0

‎test/data/test_reference_files/Tokina_AT-X_14-20_F2_PRO_DX.exv.out‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ Exif.NikonMe.MultiExposureAutoGain Long 1 0 Off
149149
Exif.Nikon3.HighISONoiseReduction Short 1 0 Off
150150
Exif.NikonAf2.Version Undefined 4 48 49 48 48 1.00
151151
Exif.NikonAf2.ContrastDetectAF Byte 1 1 On
152-
Exif.NikonAf2.AFAreaMode Byte 1 2 2
152+
Exif.NikonAf2.AFAreaMode Byte 1 2 Closest Subject
153153
Exif.NikonAf2.PhaseDetectAF Byte 1 0 Off
154154
Exif.NikonAf2.PrimaryAFPoint Byte 1 0 0
155155
Exif.NikonAf2.AFPointsUsed Byte 7 0 0 0 0 0 0 0 0 0 0 0 0 0 0

‎test/data/test_reference_files/Tokina_ATX-i_11-20mm_F2.8_CF.exv.out‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ Exif.NikonMe.MultiExposureAutoGain Long 1 0 Off
141141
Exif.Nikon3.HighISONoiseReduction Short 1 4 Normal
142142
Exif.NikonAf2.Version Undefined 4 48 49 48 48 1.00
143143
Exif.NikonAf2.ContrastDetectAF Byte 1 0 Off
144-
Exif.NikonAf2.AFAreaMode Byte 1 8 8
144+
Exif.NikonAf2.AFAreaMode Byte 1 8 Auto-area AF
145145
Exif.NikonAf2.PhaseDetectAF Byte 1 2 On (11-point)
146146
Exif.NikonAf2.PrimaryAFPoint Byte 1 1 1
147147
Exif.NikonAf2.AFPointsUsed Byte 7 15 0 0 0 0 0 0 15 0 0 0 0 0 0

0 commit comments

Comments
 (0)