Replace usage of is_tiled with tests of block shapes #278
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Replacement code matches GDAL usage.
Check block shapes instead of is_tiled
sgillies
commented
Jan 24, 2024
rio_cogeo/cogeo.py
Outdated
| @@ -660,7 +660,7 @@ def cog_info( | |||
| Bands=src_dst.count, | |||
| Width=src_dst.width, | |||
| Height=src_dst.height, | |||
| Tiled=src_dst.is_tiled, | |||
| Tiled=(src_dst.block_shapes[0][1] != src.width), | |||
There was a problem hiding this comment.
Rasterio's is_tiled is kind of a mess: https://github.com/rasterio/rasterio/blob/main/rasterio/_base.pyx#L1011-L1018. The new code here is all rio-cogeo needs and nothing more.
| @@ -60,7 +60,7 @@ def _validate_translated_rgb_jpeg(src): | |||
| assert src.height == 512 | |||
| assert src.width == 512 | |||
| assert src.meta["dtype"] == "uint8" | |||
| assert src.is_tiled | |||
| assert all([(64, 64) == (h, w) for (h, w) in src.block_shapes]) | |||
There was a problem hiding this comment.
the profile use 64x64 blocksize
|
thanks @sgillies 🙏 really appreciate you putting time on this. Merci |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This future proofs rio-cogeo and makes it more strictly conforming to what the official GDAL COG checker does.
Background: rasterio/rasterio#3014.