Merge pull request OSGeo#12539 from Pix4D/fix-flir-metadata

Fix subdomain of FLIR metadata

Author: rouault

autotest/gdrivers/jpeg.py

@@ -1275,7 +1275,6 @@ def test_jpeg_flir_png():
     assert ds.GetMetadataDomainList() == [
         "IMAGE_STRUCTURE",
         "FLIR",
-        "",
         "SUBDATASETS",
         "DERIVED_SUBDATASETS",
     ]
@@ -1330,6 +1329,7 @@ def test_jpeg_flir_png():
         "RawValueRangeMax": "61986",
         "RawValueRangeMin": "7630",
         "ReflectedApparentTemperature": "20.000000 C",
+        "RelativeHumidity": "50.000000 %",
         "UnderflowColor": "41 110 240",
     }
     subds = ds.GetSubDatasets()

frmts/jpeg/jpgdataset.cpp

@@ -688,7 +688,8 @@ void JPGDatasetCommon::ReadFLIRMetadata()
         if (fRelativeHumidity > 2)
             fRelativeHumidity /= 100.0f;  // Sometimes expressed in percentage
         SetMetadataItem("RelativeHumidity",
-                        CPLSPrintf("%f %%", 100.0f * fRelativeHumidity));
+                        CPLSPrintf("%f %%", 100.0f * fRelativeHumidity),
+                        "FLIR");
         SetMetadataItem("PlanckR1",
                         CPLSPrintf("%.8g", ReadFloat32(nRecOffset + 88)),
                         "FLIR");