Merge pull request #12778 from rouault/tiff_rgbnir

GTIFF: fix creating a R,G,B,Nir file without explicit PHOTOMETRIC creation option

Author: rouault

autotest/gcore/tiff_write.py

@@ -5350,6 +5350,41 @@ def test_tiff_write_123():
     gdaltest.tiff_drv.Delete("/vsimem/tiff_write_123_rgba_to_undefined.tif")
 
 
+###############################################################################
+# Test implicit photometric interpretation
+
+
+def test_tiff_write_RGBNir(tmp_vsimem):
+
+    out_filename = tmp_vsimem / "test_tiff_write_RGBNir.tif"
+    ds = gdaltest.tiff_drv.Create(out_filename, 1, 1, 4, gdal.GDT_Int16)
+    ds.GetRasterBand(1).SetColorInterpretation(gdal.GCI_RedBand)
+    ds.GetRasterBand(2).SetColorInterpretation(gdal.GCI_GreenBand)
+    ds.GetRasterBand(3).SetColorInterpretation(gdal.GCI_BlueBand)
+    ds.GetRasterBand(4).SetColorInterpretation(gdal.GCI_NIRBand)
+
+    errors = []
+
+    def handler(lvl, no, msg):
+        errors.append({"level": lvl, "number": no, "message": msg})
+
+    with gdaltest.error_handler(handler):
+        ds.Close()
+
+    assert len(errors) == 0
+
+    statBuf = gdal.VSIStatL(
+        str(out_filename) + ".aux.xml",
+        gdal.VSI_STAT_EXISTS_FLAG | gdal.VSI_STAT_NATURE_FLAG | gdal.VSI_STAT_SIZE_FLAG,
+    )
+    assert statBuf is None, "did not expect PAM file"
+    src_ds = gdal.Open(out_filename)
+    assert src_ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_RedBand
+    assert src_ds.GetRasterBand(2).GetColorInterpretation() == gdal.GCI_GreenBand
+    assert src_ds.GetRasterBand(3).GetColorInterpretation() == gdal.GCI_BlueBand
+    assert src_ds.GetRasterBand(4).GetColorInterpretation() == gdal.GCI_NIRBand
+
+
 ###############################################################################
 # Test error cases with palette creation
 

frmts/gtiff/gtiffrasterband_write.cpp

@@ -465,12 +465,14 @@ CPLErr GTiffRasterBand::SetColorInterpretation(GDALColorInterp eInterp)
         }
     }
 
-    // Mark alpha band / undefined in extrasamples.
-    if (eInterp == GCI_AlphaBand || eInterp == GCI_Undefined)
+    // Mark non-RGB in extrasamples.
+    if (eInterp != GCI_RedBand && eInterp != GCI_GreenBand &&
+        eInterp != GCI_BlueBand)
     {
         uint16_t *v = nullptr;
         uint16_t count = 0;
-        if (TIFFGetField(m_poGDS->m_hTIFF, TIFFTAG_EXTRASAMPLES, &count, &v))
+        if (TIFFGetField(m_poGDS->m_hTIFF, TIFFTAG_EXTRASAMPLES, &count, &v) &&
+            count > 0)
         {
             const int nBaseSamples = m_poGDS->m_nSamplesPerPixel - count;