fixed mask composite image extension
This commit is contained in:
+2
-12
@@ -503,10 +503,10 @@ fn save_composite_image(
|
|||||||
let composite =
|
let composite =
|
||||||
render_pixmap_with_scene(context.layout, settings, &context.geometry, &context.scene)?;
|
render_pixmap_with_scene(context.layout, settings, &context.geometry, &context.scene)?;
|
||||||
let composite_img = raster_image_from_pixmap(&composite, settings)?;
|
let composite_img = raster_image_from_pixmap(&composite, settings)?;
|
||||||
let composite_ext = settings.export_format.extension();
|
let composite_ext = settings.mask_format.extension();
|
||||||
let composite_path = context.folder.join(format!("composite.{composite_ext}"));
|
let composite_path = context.folder.join(format!("composite.{composite_ext}"));
|
||||||
composite_img
|
composite_img
|
||||||
.save_with_format(&composite_path, export_image_format(settings.export_format))
|
.save_with_format(&composite_path, mask_image_format(settings.mask_format))
|
||||||
.map_err(|e| format!("Failed writing {}: {e}", composite_path.display()))?;
|
.map_err(|e| format!("Failed writing {}: {e}", composite_path.display()))?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
@@ -705,16 +705,6 @@ fn mask_image_format(format: MaskFormat) -> ImageFormat {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Map an export format to an image encoding.
|
|
||||||
fn export_image_format(format: ExportFormat) -> ImageFormat {
|
|
||||||
match format {
|
|
||||||
ExportFormat::Png => ImageFormat::Png,
|
|
||||||
ExportFormat::Jpeg => ImageFormat::Jpeg,
|
|
||||||
ExportFormat::Webp => ImageFormat::WebP,
|
|
||||||
ExportFormat::Svg | ExportFormat::Folder => ImageFormat::Png,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Convert a pixmap into a raster image at the target size.
|
// Convert a pixmap into a raster image at the target size.
|
||||||
fn raster_image_from_pixmap(
|
fn raster_image_from_pixmap(
|
||||||
pixmap: &Pixmap,
|
pixmap: &Pixmap,
|
||||||
|
|||||||
Reference in New Issue
Block a user