Bump Apache Commons Imaging to official 1.0.0-alpha5 #80
Conversation
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
We no longer need to use a custom patched version of the lib as 1.0-alpha3 has support for integer tiff and was released almost 4 years ago. (cherry picked from commit d41f73d) # Conflicts: # README.md # build.gradle # src/main/java/net/buildtheearth/terraplusplus/config/GlobalParseRegistries.java # src/main/java/net/buildtheearth/terraplusplus/config/scalarparse/d/ParseTiffAutoDSP.java # src/main/java/net/buildtheearth/terraplusplus/config/scalarparse/d/ParseTiffDSP.java # src/main/resources/net/buildtheearth/terraplusplus/dataset/scalar/heights.json5
1.0.0-alpha6 is also available, but adds a transitive dependency to a version of Apache commons with a CVE for no real advantage, so we stick with 1.0.0-alpha5 for now. (cherry picked from commit ea00056) # Conflicts: # build.gradle
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 PR overalls the parsing of datasets from TIFF images by upgrading the Apache Commons imaging to 1.0.0-alpha5. Previous Terra++ version has to rely on a modified version of the dependency and on special treatment of TIFF files to differentiate integer and floating-point implementations. This is no longer needed as Commons Imaging now supports both format within a single intelligent implementation that handles both seamlessly.
Detailed changes:
parse_tiffthat can parse both floating point and integer images (implemented in theParseTiffDspclass)parse_tiff_auto,parse_tiff_int,parse_tiff_fp:parse_tiffunder the hoodparse_tiffThese changes have existed in Terra-- for some time and have been working fine there.