Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GTiff: internal overview building: do not set PHOTOMETRIC=YCBCR when … #11560

Merged
merged 1 commit into from
Jan 4, 2025
+31 −1
Merged

GTiff: internal overview building: do not set PHOTOMETRIC=YCBCR when … #11560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions autotest/gcore/tiff_ovr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1675,6 +1675,33 @@ def test_tiff_ovr_43(tmp_path, both_endian):
assert cs == 642, "did not get expected checksum"


###############################################################################
# Test that we do not propagate PHOTOMETRIC=YCBCR on overviews when
# COMPRESS_OVERVIEW != JPEG


@pytest.mark.require_creation_option("GTiff", "JPEG")
@gdaltest.enable_exceptions()
def test_tiff_ovr_do_not_propagate_photometric_ycbcr_if_ovr_if_not_jpeg(tmp_path):

tif_fname = str(tmp_path / "test.tif")

ds = gdal.GetDriverByName("GTiff").Create(
tif_fname, 8, 8, 3, options=["COMPRESS=JPEG", "PHOTOMETRIC=YCBCR"]
)
ds.GetRasterBand(1).Fill(255)
ds.GetRasterBand(2).Fill(255)
ds.GetRasterBand(3).Fill(255)
ds = None

with gdal.Open(tif_fname, gdal.GA_Update) as ds:
with gdal.config_option("COMPRESS_OVERVIEW", "DEFLATE"):
ds.BuildOverviews("NEAR", [2])

with gdal.Open(tif_fname) as ds:
assert ds.GetRasterBand(1).GetOverview(0).ComputeRasterMinMax() == (255, 255)


###############################################################################
# Test that we can change overview block size through GDAL_TIFF_OVR_BLOCKSIZE configuration
# option
Expand Down
5 changes: 4 additions & 1 deletion frmts/gtiff/gtiffdataset_write.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2709,7 +2709,10 @@ bool GTiffDataset::GetOverviewParameters(
/* -------------------------------------------------------------------- */
/* Determine photometric tag */
/* -------------------------------------------------------------------- */
nPhotometric = m_nPhotometric;
if (m_nPhotometric == PHOTOMETRIC_YCBCR && nCompression != COMPRESSION_JPEG)
nPhotometric = PHOTOMETRIC_RGB;
else
nPhotometric = m_nPhotometric;
const char *pszPhotometric =
GetOptionValue("PHOTOMETRIC", "PHOTOMETRIC_OVERVIEW", &pszOptionKey);
if (!GTIFFUpdatePhotometric(pszPhotometric, pszOptionKey, nCompression,
Expand Down
Loading