Add ColorType::Multiband enum variant to support samples>1 per pixel #224
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
…lowing BlackIsZero and WhiteIsZero to have up to 64 bits per sample. Also includes decode_geotiff_images unit test.
Contains attributes bit_depth and num_samples
When PhotometricInterpretation is BlackisZero or WhiteIsZero, and samples per pixel is more than 1, set the ColorType to Multiband. Also ensure that the expand_chunk function handles ColorType::Multiband, and updated the decode_geotiff_images unit test.
weiji14
commented
Mar 4, 2024
src/decoder/image.rs
Outdated
Comment on lines
578
to
584
| ( | ||
| ColorType::Multiband { | ||
| bit_depth: _n, | ||
| num_samples: _samples, | ||
| }, | ||
| _, | ||
| ) => {} |
There was a problem hiding this comment.
A little unsure if this should be a separate branch, or go in one of the branches above. Not familiar with what the Horizontal and FloatingPoint predictors are.
There was a problem hiding this comment.
The predictors are filters that are applied to the pixel data before compression, to help improve the compression ratio. Multiband should be included in both the match existing match arms where Gray is.
There was a problem hiding this comment.
Ok, done at e0b9ae0, but best if you can double check it. I don't have a multi-band TIFF file with a Horizontal/FloatingPoint predictor to test this out on.
weiji14
added a commit
to weiji14/cog3pio
that referenced
this pull request
Mar 17, 2024
Pulling from the `multi-band-geotiff` branch from my personal fork, that is currently in a pull request at image-rs/image-tiff#224.
This was referenced Mar 17, 2024
weiji14
added a commit
to weiji14/cog3pio
that referenced
this pull request
Mar 24, 2024
The Multi-band PR at image-rs/image-tiff#224 has been merged, so updating to use the main branch instead.
weiji14
added a commit
to weiji14/cog3pio
that referenced
this pull request
Mar 25, 2024
* 📌 Use image-tiff fork with multi-band support Pulling from the `multi-band-geotiff` branch from my personal fork, that is currently in a pull request at image-rs/image-tiff#224. * ✨ Support reading multi-band GeoTIFF files Count the number of bands or channels in the GeoTIFF file when decoding by looking at the ColorType. E.g. Gray = 1 band, Multiband = N bands. Added a unit test to read a 2-band float32 GeoTIFF file. * ✅ Pytest check reading multi-band remote GeoTIFF Ensure that reading a multi-band GeoTIFF file from a remote URL works. * 📝 Update note on multi-band support in main README.md Also clarify that the roadmap item on reading single-band GeoTIFFs is for different dtypes. * 📌 Pin to image-tiff 0c54a18 The Multi-band PR at image-rs/image-tiff#224 has been merged, so updating to use the main branch instead. * 🥅 Return TiffUnsupportedError instead of unimplemented panic Replace `unimplemented!` with a recoverable TiffError::UnsupportedError instead to allow for better exception handling. Moved the band counting logic in the ndarray method above the image dimension line, and added a unit test to ensure unsupported ColorType TIFFs are handled properly.
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.
Building on the work at #216 to support reading multi-band TIFF images (common in GeoTIFFs).
This PR extends the work done by @tromper in #216 which added the unit test for reading a 5-band GeoTIFF. I've just added the
ColorType::Multibandenum variant as suggested at #216 (comment)), and made sure that the decoder functions can handle this multi-band type.References:
Supersedes #216, closes #214 and resolves #147.