Merge pull request #2315 from Exiv2/nikon_wb_027

Add Nikon3.WhiteBalanceBias2 (backport #2311)
Exiv2 · Aug 9, 2022 · 232d423 · 232d423
2 parents aadb126 + 4251ff3
commit 232d423
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 11 deletions.
diff --git a/.github/workflows/on_PR_linux_matrix.yml b/.github/workflows/on_PR_linux_matrix.yml
@@ -19,7 +19,7 @@ jobs:
       - name: install dependencies
         run: |
           sudo apt-get install ninja-build
-          pip3 install conan==1.48.1
+          pip3 install conan==1.51.0
 
       - name: Conan common config
         run: |

diff --git a/.github/workflows/on_PR_linux_special_buils.yml b/.github/workflows/on_PR_linux_special_buils.yml
@@ -16,7 +16,7 @@ jobs:
       - name: install dependencies
         run: |
           sudo apt-get install ninja-build
-          pip3 install conan==1.48.1
+          pip3 install conan==1.51.0
 
       - name: Conan common config
         run: |
@@ -63,7 +63,7 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install valgrind ninja-build
-          pip3 install conan==1.48.1
+          pip3 install conan==1.51.0
 
       - name: Conan common config
         run: |
@@ -100,7 +100,7 @@ jobs:
       - name: install dependencies
         run: |
           sudo apt-get install ninja-build
-          pip3 install conan==1.48.1
+          pip3 install conan==1.51.0
 
       - name: Conan common config
         run: |
@@ -136,7 +136,7 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install valgrind doxygen graphviz gettext
-          pip3 install conan==1.48.1
+          pip3 install conan==1.51.0
 
       - name: Conan common config
         run: |

diff --git a/.github/workflows/on_PR_windows_matrix.yml b/.github/workflows/on_PR_windows_matrix.yml
@@ -46,7 +46,7 @@ jobs:
 
       - name: Install Conan & Common config
         run: |
-          pip.exe install "conan==1.48.1"
+          pip.exe install "conan==1.51.0"
           conan profile new --detect default
           conan profile update settings.build_type=${{matrix.build_type}} default
           conan profile update settings.compiler="Visual Studio" default

diff --git a/.github/workflows/on_push_BasicWinLinMac.yml b/.github/workflows/on_push_BasicWinLinMac.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Install Conan & Common config
         run: |
-          pip.exe install "conan==1.48.1"
+          pip.exe install "conan==1.51.0"
           conan config install https://github.com/conan-io/conanclientcert.git
           conan profile new --detect default
           conan profile show default
@@ -77,7 +77,7 @@ jobs:
       - name: install dependencies
         run: |
           sudo apt-get install ninja-build
-          pip3 install conan==1.48.1
+          pip3 install conan==1.51.0
 
       - name: Conan
         run: |

diff --git a/.github/workflows/on_push_ExtraJobsForMain.yml b/.github/workflows/on_push_ExtraJobsForMain.yml
@@ -17,7 +17,7 @@ jobs:
 
       - name: install dependencies
         run: |
-          pip3 install conan==1.48.1
+          pip3 install conan==1.51.0
 
       - name: Conan common config
         run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get install ninja-build gettext doxygen graphviz
-          pip3 install conan==1.43.0
+          pip3 install conan==1.51.0
 
       - name: Conan common config
         run: |
@@ -110,7 +110,7 @@ jobs:
 
       - name: Install Conan & Common config
         run: |
-          pip.exe install "conan==1.43.0"
+          pip.exe install "conan==1.51.0"
           conan config install https://github.com/conan-io/conanclientcert.git
           conan profile new --detect default
           conan profile update settings.build_type=Release default

diff --git a/src/nikonmn_int.cpp b/src/nikonmn_int.cpp
@@ -593,6 +593,7 @@ namespace Exiv2 {
         TagInfo(0x002a, "VignetteControl", N_("Vignette Control"), N_("Vignette control"), nikon3Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(nikonOlnh)),
         TagInfo(0x0034, "ShutterMode", N_("Shutter Mode"), N_("Shutter mode"), nikon3Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(nikonShutterModes)),
         TagInfo(0x0037, "MechanicalShutterCount", N_("Mechanical Shutter Count"), N_("Mechanical shutter count"), nikon3Id, makerTags, unsignedLong, -1, printValue),
+        TagInfo(0x003f, "WhiteBalanceBias2", N_("White Balance Bias 2"), N_("White balance bias 2"), nikon3Id, makerTags, signedRational, -1, printValue),
         TagInfo(0x0080, "ImageAdjustment", N_("Image Adjustment"), N_("Image adjustment setting"), nikon3Id, makerTags, asciiString, -1, printValue),
         TagInfo(0x0081, "ToneComp", N_("Tone Compensation"), N_("Tone compensation"), nikon3Id, makerTags, asciiString, -1, printValue),
         TagInfo(0x0082, "AuxiliaryLens", N_("Auxiliary Lens"), N_("Auxiliary lens (adapter)"), nikon3Id, makerTags, asciiString, -1, printValue),