-
Notifications
You must be signed in to change notification settings - Fork 12
fix: default SamplesPerPixel to 1 when tag is absent #319
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.
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
Open
TomNicholas
wants to merge
1
commit into
developmentseed:main
Choose a base branch
from
TomNicholas:fix/samples-per-pixel-default
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Binary file not shown.
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -372,7 +372,10 @@ impl ImageFileDirectory { | |||||||||||
| geo_key_directory = Some(GeoKeyDirectory::from_tags(tags)?); | ||||||||||||
| } | ||||||||||||
|
|
||||||||||||
| let samples_per_pixel = samples_per_pixel.expect("samples_per_pixel not found"); | ||||||||||||
| // SamplesPerPixel (tag 277) defaults to 1 when the tag is absent. | ||||||||||||
| // TIFF 6.0 spec, "SamplesPerPixel ... Default = 1": https://download.osgeo.org/libtiff/doc/TIFF6.pdf | ||||||||||||
| // Many single-channel grayscale TIFFs (e.g. PerkinElmer/Phenix microscopy) omit it. | ||||||||||||
|
Comment on lines
+375
to
+377
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is verbose; just say
Suggested change
|
||||||||||||
| let samples_per_pixel = samples_per_pixel.unwrap_or(1); | ||||||||||||
| let planar_configuration = if let Some(planar_configuration) = planar_configuration { | ||||||||||||
| planar_configuration | ||||||||||||
| } else if samples_per_pixel == 1 { | ||||||||||||
|
|
||||||||||||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| use crate::test::util::open_tiff; | ||
| use crate::tags::PhotometricInterpretation; | ||
|
|
||
| /// Regression test for TIFFs that omit the `SamplesPerPixel` tag (277). | ||
| /// | ||
| /// The TIFF 6.0 specification defines a default of 1 for `SamplesPerPixel`, and | ||
| /// some single-channel grayscale TIFFs (e.g. PerkinElmer/Phenix microscopy | ||
| /// images) omit the tag entirely. Parsing such files used to panic with | ||
| /// "samples_per_pixel not found"; it must instead fall back to the spec default. | ||
| #[tokio::test] | ||
| async fn test_missing_samples_per_pixel_defaults_to_one() { | ||
| let filename = "other/grayscale_no_samplesperpixel.tif"; | ||
| let (_reader, tiff) = open_tiff(filename).await; | ||
| let ifd = &tiff.ifds()[0]; | ||
|
|
||
| assert_eq!(ifd.samples_per_pixel(), 1); | ||
| assert_eq!(ifd.image_width(), 2); | ||
| assert_eq!(ifd.image_height(), 2); | ||
| assert_eq!( | ||
| ifd.photometric_interpretation(), | ||
| PhotometricInterpretation::BlackIsZero | ||
| ); | ||
| } |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| mod geo; | ||
| mod geotiff_test_data; | ||
| mod image_tiff; | ||
| mod missing_samples_per_pixel; | ||
| mod ome_tiff; | ||
| pub(crate) mod util; |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could we:
rasterio_generateddirectory how there's a Python script that creates the file.