Depthmap fixes #60
Merged
Depthmap fixes #60
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
For scientific images coming from the ARCHiOX project, they are 16bit tiffs wcontaining depth or normal maps. For conversion to jpg for thumbnail purposes, we attampt to downsample to 8bit. FOr conversion to JPEG2000, I think Kakadu can handle these as JPEG2000 does support these bpp values. We need to allow the different Pillow image modes, though.
mel-mason commented Feb 15, 2024
image_processing/validation.py Outdated
| if source_image.mode != converted_image.mode: | ||
| if source_image.mode == BITONAL and converted_image.mode == GREYSCALE: | ||
| logger.info('Converted image is greyscale, not bitonal. This is expected') | ||
| elif source_image.mode in ['RGBX', 'I;16'] and converted_image.mode in ['RGB', 'RGBA']: |
Member Author
There was a problem hiding this comment.
This exception is only necessary for conversions from TIFF to JPG when creating thumbnails, and we don't usually run this check on the thumbnail, so I'm removing this to keep the validation as stringent as possible
mel-mason commented Feb 15, 2024
tests/test_conversion.py Outdated
| conversion.Converter().convert_to_jpg(filepaths.NORMALMAP_TIF, output_file, resize=None, | ||
| quality=derivative_files_generator.DEFAULT_JPG_HIGH_QUALITY_VALUE) | ||
| assert os.path.isfile(output_file) | ||
| validation.check_colour_profiles_match(filepaths.NORMALMAP_TIF, output_file) |
Member Author
There was a problem hiding this comment.
This method isn't really designed to check the result of a lossy conversion from tif to jpeg, so will fail here - I'll remove this line
…eeded for tiff->jpeg conversion. Move normal/depth map jp2 conversion tests to derivatives_generator and add losslessness checks. Remove colour profile check for jpg conversion tests. Decompress normal_map.tif so demo kakadu versions can run the tests.
…ed it lost the RGBX colour mode. Add RGBX support - convert to RGBA. Document RGBX support
Member Author
| I've checked that the docs changes build correctly |
irv approved these changes Mar 5, 2024
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.
Add support for normal map and depth map images from our Archiox project, which include 16 bit and RGBX images