svg2img 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: facc47fc0eab418cfe750f69e9bbfe715d275712ce9cfdab91c1636464227e1a
-  data.tar.gz: 69c80ee30083e9a1606d671917933956ef3252371ef2534af36402a301096b83
+  metadata.gz: 73a2ea65b81532ded264b2ec92e94d3ac146fda59529c2501625e1ac0fa6472c
+  data.tar.gz: 1a378f708361feec86a69733148206d175cb58b354f4f140ab7f2e5fa10faf9d
 SHA512:
-  metadata.gz: bc06eaf11a13413293ae4ad3580ab60a72811b854eb4e7a17ea65c7ef5d6ad36506a21af607fc9a63e8963c7bc3b82e60ddaa8e9b2c78e1c0bab74c84cf5b195
-  data.tar.gz: 81cdd0a53eb265ec5763777235c4f7da633e4d352f19855d9b0694eeff3afa203bf464a2d2ce3431e71b5c8fbc1608b7b6f0b39bbed71219237717411d367dee
+  metadata.gz: e0ae235c6a4addf8c2495bd2674f1508359ec58d08d77d1944587cab178dee8a32657f5b6c77c68a1a541a4a7b01889d9eae8980b18cd1dd96235bd1f8d55899
+  data.tar.gz: b7af313204aaac5b70b08b614cacced3eb56d35c54febbb4da93c316842f724236729ab41b12575779284e60e36cacf7dc17df02bca4269b1f002f6ef76f5f81

data/Cargo.toml

@@ -5,3 +5,7 @@
 [workspace]
 members = ["./ext/svg2img"]
 resolver = "2"
+
+[profile.release]
+lto = true
+strip = true

data/README.md

@@ -73,6 +73,7 @@ send_data(png_data, type: 'image/png', disposition: 'inline')
 - `format` - output format, one of `:png`, `:jpg`, `:webp`, `:gif`
 - `output_path` - path to the output image. If not provided, a temporary file will be created and the path to it will be returned.
 - `size` - size of the output image as a proc that receives the width and height of the SVG and returns an array with the width and height of the output image. If the provides size has a different aspect ratio than the SVG, the image will be resized to fit in the center of the provided size. If not provided, the output image will have the same size as the SVG.
+- `super_sampling` - supersample factor. The output image will be rendered `super_sampling` times larger than the SVG and then resized to the desired size. This can be used to improve the quality of the output image. Default is 2. Must be a power of 2. 1 means no super sampling.
 
 ## Development
 

data/ext/svg2img/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
-name = "svg2img"
-version = "0.1.0"
-edition = "2021"
 authors = ["Orvar Segerström <orvarsegerstrom@gmail.com>"]
+edition = "2021"
 license = "MIT"
+name = "svg2img"
 publish = false
+version = "0.1.0"
 
 [lib]
 crate-type = ["cdylib"]

data/ext/svg2img/src/lib.rs

@@ -1,5 +1,5 @@
 use anyhow::Context;
-use image::{DynamicImage, ImageBuffer};
+use image::{DynamicImage, ImageBuffer, ImageEncoder};
 use magnus::{block::Proc, function, prelude::*, Error, Ruby};
 use std::panic::{self, AssertUnwindSafe};
 
@@ -27,12 +27,23 @@ fn process_svg_rb(svg: String, options: magnus::RHash) -> Result<String, magnus:
             }
         };
     }
+
+    let super_sampling = get_option::<u32>(&options, "super_sampling")?.unwrap_or(2);
+    // super_sampling must me a power of 2
+    if super_sampling == 0 || super_sampling & (super_sampling - 1) != 0 {
+        return Err(magnus::Error::new(
+            magnus::exception::arg_error(),
+            "svg2img: Invalid super_sampling value, must be a power of 2",
+        ));
+    }
+
     let options = Options {
         size: get_option::<Proc>(&options, "size")?
             .map(convert_size_proc)
             .unwrap_or_else(default_size),
-        format,
         output_path: get_option(&options, "output_path")?,
+        format,
+        super_sampling,
     };
     process_svg(svg, options)
         .map_err(|err| magnus::Error::new(magnus::exception::runtime_error(), format!("{err:?}")))
@@ -97,10 +108,17 @@ struct Options {
     size: ProcessSize,
     format: image::ImageFormat,
     output_path: Option<String>,
+    super_sampling: u32,
 }
 
 fn process_svg(svg: String, options: Options) -> Result<String, anyhow::Error> {
-    let mut image = image_from_svg(svg.as_bytes(), options.size)?;
+    let image = image_from_svg(svg.as_bytes(), options.size, options.super_sampling)?;
+
+    let mut image = image.resize_exact(
+        image.width() / options.super_sampling,
+        image.height() / options.super_sampling,
+        image::imageops::FilterType::Lanczos3,
+    );
 
     if options.format == image::ImageFormat::Jpeg {
         // Convert from rgba8 to rgb8
@@ -109,9 +127,27 @@ fn process_svg(svg: String, options: Options) -> Result<String, anyhow::Error> {
 
     let mut buf = Vec::new();
     let mut cursor = std::io::Cursor::new(&mut buf);
-    image
-        .write_to(&mut cursor, options.format)
-        .context("Failed to write image to buffer")?;
+    match options.format {
+        image::ImageFormat::Png => {
+            image::codecs::png::PngEncoder::new_with_quality(
+                &mut cursor,
+                image::codecs::png::CompressionType::Best,
+                image::codecs::png::FilterType::Adaptive,
+            )
+            .write_image(
+                &image.to_rgba8().into_raw(),
+                image.width(),
+                image.height(),
+                image.color().into(),
+            )
+            .context("Failed to encode PNG")?;
+        }
+        _ => {
+            image
+                .write_to(&mut cursor, options.format)
+                .context("Failed to write image to buffer")?;
+        }
+    };
 
     let output_path = options.output_path.unwrap_or_else(|| {
         let random_filename = format!(
@@ -133,7 +169,11 @@ fn process_svg(svg: String, options: Options) -> Result<String, anyhow::Error> {
     Ok(output_path)
 }
 
-fn image_from_svg(bytes: &[u8], size: ProcessSize) -> Result<DynamicImage, anyhow::Error> {
+fn image_from_svg(
+    bytes: &[u8],
+    size: ProcessSize,
+    super_sampling: u32,
+) -> Result<DynamicImage, anyhow::Error> {
     let svg = resvg::usvg::Tree::from_data(bytes, &resvg::usvg::Options::default())
         .context("Failed to parse SVG")?;
     let svg_width = svg.size().width();
@@ -141,6 +181,8 @@ fn image_from_svg(bytes: &[u8], size: ProcessSize) -> Result<DynamicImage, anyho
     let svg_ratio = svg_width / svg_height;
 
     let (image_width, image_height) = size(svg_width as u32, svg_height as u32)?;
+    let image_width = image_width * super_sampling;
+    let image_height = image_height * super_sampling;
     let image_ratio = image_width as f32 / image_height as f32;
 
     let scale = if svg_ratio > image_ratio {

data/lib/svg2img/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Svg2Img
-  VERSION = "0.2.2"
+  VERSION = "0.2.4"
 end

data/tmp/arm64-darwin23/stage/Cargo.toml

@@ -5,3 +5,7 @@
 [workspace]
 members = ["./ext/svg2img"]
 resolver = "2"
+
+[profile.release]
+lto = true
+strip = true

data/tmp/arm64-darwin23/stage/ext/svg2img/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
-name = "svg2img"
-version = "0.1.0"
-edition = "2021"
 authors = ["Orvar Segerström <orvarsegerstrom@gmail.com>"]
+edition = "2021"
 license = "MIT"
+name = "svg2img"
 publish = false
+version = "0.1.0"
 
 [lib]
 crate-type = ["cdylib"]

data/tmp/arm64-darwin23/stage/tmp/arm64-darwin23/stage/Cargo.toml

@@ -5,3 +5,7 @@
 [workspace]
 members = ["./ext/svg2img"]
 resolver = "2"
+
+[profile.release]
+lto = true
+strip = true

data/tmp/arm64-darwin23/stage/tmp/arm64-darwin23/stage/ext/svg2img/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
-name = "svg2img"
-version = "0.1.0"
-edition = "2021"
 authors = ["Orvar Segerström <orvarsegerstrom@gmail.com>"]
+edition = "2021"
 license = "MIT"
+name = "svg2img"
 publish = false
+version = "0.1.0"
 
 [lib]
 crate-type = ["cdylib"]