Improve handling of OME-TIFF multi-file filesets with partial metadata blocks (rebased onto dev_5_1) #2320
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
…a blocks This commit partly reverts a previous bug fix for OME-TIFF with BinaryOnly blocks where the MetatadaFile check in isThisType(RandomAccessInputStream) was solely based on the file extension. Instead, an extra check is performed at the isThisType(String, boolean) level if metadataFile has been set by isThisType(RandomAccessInputStream) to parse the metadata.
|
--rebased-from #2314 |
|
https://ci.openmicroscopy.org/view/Bio-Formats-5.1/job/BIOFORMATS-5.1-merge-repository-subset/234/ is green. Tested all the QA posts tested by David in #2314 (comment). Everything works as expected. Looks good to merge |
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 is the same as gh-2314 but rebased onto dev_5_1.
See https://trello.com/c/mVFYhwcJ/87-ome-tiff-missing-metadata-file
This commit partly reverts a previous bug fix for OME-TIFF with
BinaryOnlyblocks where theMetatadaFilecheck inisThisType(RandomAccessInputStream)was solely based on the file extension. Instead, an extra check is performed at theisThisType(String, boolean)level ifmetadataFilehas been set byisThisType(RandomAccessInputStream)to parse the metadata.To test this PR:
>. In all cases, runningshowinfat one of theBinaryOnlyOME-TIFF should display the image without error but fall back to being detected as TIFF