standardize on u32 vs i32 for jpeg coordinates/width etc to support large JPEGs #126
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
Melirius
reviewed
Dec 3, 2024
Comment on lines
+480
to
+487
| self.mcuv = NonZeroU32::new( | ||
| (1.0 * self.img_height as f64 / (8.0 * self.sfhm as f64)).ceil() as u32, | ||
| ) | ||
| .ok_or_else(|| LeptonError::new(ExitCode::UnsupportedJpeg, "mcuv is zero"))?; | ||
|
|
||
| self.mcuh = | ||
| NonZeroU32::new((1.0 * self.img_width as f64 / (8.0 * self.sfvm as f64)).ceil() as u32) | ||
| .ok_or_else(|| LeptonError::new(ExitCode::UnsupportedJpeg, "mcuh is zero"))?; |
There was a problem hiding this comment.
Why not make use of integer arithmetics? And I have an impression that these checks are superfluous: checks of nonzero img_height and img_width are enough.
There was a problem hiding this comment.
Yeah I guess that's just a round up
Melirius
reviewed
Dec 3, 2024
Melirius
approved these changes
Dec 4, 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.
We were using i32s which overflow for very large JPEGs which can be 65535x65535.
In general this cleans up the code quite a bit.