caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-05-14 17:15:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't crash on image with zero DPI (#5835)

Browse Source
This commit is contained in:
PgBiel 2025-02-10 07:39:04 -03:00 committed by GitHub
parent e4f8e57c53
commit 3fba256405
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/typst-layout/src/image.rs
View File

@ -95,6 +95,8 @@ pub fn layout_image(
} else { } else {
// If neither is forced, take the natural image size at the image's // If neither is forced, take the natural image size at the image's
// DPI bounded by the available space. // DPI bounded by the available space.
//
// Division by DPI is fine since it's guaranteed to be positive.
let dpi = image.dpi().unwrap_or(Image::DEFAULT_DPI); let dpi = image.dpi().unwrap_or(Image::DEFAULT_DPI);
let natural = Axes::new(pxw, pxh).map(|v| Abs::inches(v / dpi)); let natural = Axes::new(pxw, pxh).map(|v| Abs::inches(v / dpi));
Size::new( Size::new(

6
crates/typst-library/src/visualize/image/raster.rs
View File

@ -160,6 +160,8 @@ impl RasterImage {
} }
/// The image's pixel density in pixels per inch, if known. /// The image's pixel density in pixels per inch, if known.
///
/// This is guaranteed to be positive.
pub fn dpi(&self) -> Option<f64> { pub fn dpi(&self) -> Option<f64> {
self.0.dpi self.0.dpi
} }
@ -334,6 +336,9 @@ fn apply_rotation(image: &mut DynamicImage, rotation: u32) {
} }
/// Try to determine the DPI (dots per inch) of the image. /// Try to determine the DPI (dots per inch) of the image.
///
/// This is guaranteed to be a positive value, or `None` if invalid or
/// unspecified.
fn determine_dpi(data: &[u8], exif: Option<&exif::Exif>) -> Option<f64> { fn determine_dpi(data: &[u8], exif: Option<&exif::Exif>) -> Option<f64> {
// Try to extract the DPI from the EXIF metadata. If that doesn't yield // Try to extract the DPI from the EXIF metadata. If that doesn't yield
// anything, fall back to specialized procedures for extracting JPEG or PNG // anything, fall back to specialized procedures for extracting JPEG or PNG
@ -341,6 +346,7 @@ fn determine_dpi(data: &[u8], exif: Option<&exif::Exif>) -> Option<f64> {
exif.and_then(exif_dpi) exif.and_then(exif_dpi)
.or_else(|| jpeg_dpi(data)) .or_else(|| jpeg_dpi(data))
.or_else(|| png_dpi(data)) .or_else(|| png_dpi(data))
.filter(|&dpi| dpi > 0.0)
} }
/// Try to get the DPI from the EXIF metadata. /// Try to get the DPI from the EXIF metadata.