Merge pull request #513 from Brooooooklyn/fix-image-smooth

fix: miss applying image_smoothing_enabled and image_smoothing_quality
Brooooooklyn · Aug 5, 2022 · 0e73a98 · 0e73a98
2 parents 110606b + 20b1b02
commit 0e73a98
Show file tree

Hide file tree

Showing 44 changed files with 68 additions and 20 deletions.
diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
@@ -59,15 +59,14 @@ jobs:
               export CFLAGS="-isysroot $SYSROOT -isystem $SYSROOT";
               yarn build --target aarch64-apple-darwin
               strip -x skia.darwin-arm64.node
-          - host: ubuntu-18.04
+          - host: ubuntu-latest
             downloadTarget: 'aarch64-unknown-linux-gnu'
             target: 'aarch64-unknown-linux-gnu'
-            setup: |
-              sudo apt-get update
-              sudo apt-get install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu  -y
+            docker: |
+              docker pull ghcr.io/brooooooklyn/canvas/ubuntu-builder:focal-aarch64
+              docker tag ghcr.io/brooooooklyn/canvas/ubuntu-builder:focal-aarch64 builder
             build: |
-              yarn build --target aarch64-unknown-linux-gnu
-              aarch64-linux-gnu-strip skia.linux-arm64-gnu.node
+              docker run --rm -v ~/.cargo/git:/usr/local/cargo/git -v ~/.cargo/registry:/usr/local/cargo/registry -v $(pwd):/canvas -w /canvas builder sh -c "rustup toolchain install $(cat ./rust-toolchain) && rustup target add aarch64-unknown-linux-gnu && yarn build --target aarch64-unknown-linux-gnu && llvm-strip-14 skia.linux-arm64-gnu.node"
           - host: ubuntu-latest
             target: 'aarch64-unknown-linux-musl'
             downloadTarget: 'aarch64-unknown-linux-musl'

diff --git a/__test__/image-snapshot.ts b/__test__/image-snapshot.ts
@@ -32,7 +32,7 @@ export async function snapshotImage<C>(
   } catch {
     existed = false
   }
-  if (!existed) {
+  if (!existed || process.env.UPDATE_SNAPSHOT) {
     await fs.writeFile(p, image)
     t.pass()
   } else {

diff --git a/__test__/snapshots/arc.png b/__test__/snapshots/arc.png
diff --git a/__test__/snapshots/arcTo-colorful.png b/__test__/snapshots/arcTo-colorful.png
diff --git a/__test__/snapshots/arcTo.png b/__test__/snapshots/arcTo.png
diff --git a/__test__/snapshots/avif-output.avif b/__test__/snapshots/avif-output.avif
diff --git a/__test__/snapshots/bezierCurveTo-colorful.png b/__test__/snapshots/bezierCurveTo-colorful.png
diff --git a/__test__/snapshots/bezierCurveTo.png b/__test__/snapshots/bezierCurveTo.png
diff --git a/__test__/snapshots/clearRect.png b/__test__/snapshots/clearRect.png
diff --git a/__test__/snapshots/createRadialGradient.png b/__test__/snapshots/createRadialGradient.png
diff --git a/__test__/snapshots/draw-image-svg-noto-emoji.png b/__test__/snapshots/draw-image-svg-noto-emoji.png
diff --git a/__test__/snapshots/drawImage-another-Canvas.png b/__test__/snapshots/drawImage-another-Canvas.png
diff --git a/__test__/snapshots/drawImage-svg-resize.png b/__test__/snapshots/drawImage-svg-resize.png
diff --git a/__test__/snapshots/drawImage-svg.png b/__test__/snapshots/drawImage-svg.png
diff --git a/__test__/snapshots/drawImage.png b/__test__/snapshots/drawImage.png
diff --git a/__test__/snapshots/ellipse.png b/__test__/snapshots/ellipse.png
diff --git a/__test__/snapshots/fillText-COLRv1.png b/__test__/snapshots/fillText-COLRv1.png
diff --git a/__test__/snapshots/fillText.png b/__test__/snapshots/fillText.png
diff --git a/__test__/snapshots/filter-blur.png b/__test__/snapshots/filter-blur.png
diff --git a/__test__/snapshots/filter-brightness.png b/__test__/snapshots/filter-brightness.png
diff --git a/__test__/snapshots/filter-combine-contrast-brightness.png b/__test__/snapshots/filter-combine-contrast-brightness.png
diff --git a/__test__/snapshots/filter-contrast-ff.png b/__test__/snapshots/filter-contrast-ff.png
diff --git a/__test__/snapshots/filter-contrast.png b/__test__/snapshots/filter-contrast.png
diff --git a/__test__/snapshots/filter-drop-shadow.png b/__test__/snapshots/filter-drop-shadow.png
diff --git a/__test__/snapshots/filter-grayscale.png b/__test__/snapshots/filter-grayscale.png
diff --git a/__test__/snapshots/filter-hue-rotate.png b/__test__/snapshots/filter-hue-rotate.png
diff --git a/__test__/snapshots/filter-invert.png b/__test__/snapshots/filter-invert.png
diff --git a/__test__/snapshots/filter-opacity.png b/__test__/snapshots/filter-opacity.png
diff --git a/__test__/snapshots/filter-saturate.png b/__test__/snapshots/filter-saturate.png
diff --git a/__test__/snapshots/filter-save-restore.png b/__test__/snapshots/filter-save-restore.png
diff --git a/__test__/snapshots/filter-sepia.png b/__test__/snapshots/filter-sepia.png
diff --git a/__test__/snapshots/quadraticCurveTo.png b/__test__/snapshots/quadraticCurveTo.png
diff --git a/__test__/snapshots/should draw img.jpg b/__test__/snapshots/should draw img.jpg
diff --git a/__test__/snapshots/stroke-and-filling-jpeg.jpg b/__test__/snapshots/stroke-and-filling-jpeg.jpg
diff --git a/__test__/snapshots/strokeText.png b/__test__/snapshots/strokeText.png
diff --git a/__test__/snapshots/svg-transparent-background.png b/__test__/snapshots/svg-transparent-background.png
diff --git a/__test__/snapshots/transform-with-radial-gradient-x.png b/__test__/snapshots/transform-with-radial-gradient-x.png
diff --git a/__test__/snapshots/transform-with-radial-gradient.png b/__test__/snapshots/transform-with-radial-gradient.png
diff --git a/__test__/snapshots/webp-output.webp b/__test__/snapshots/webp-output.webp
diff --git a/build.rs b/build.rs
@@ -36,13 +36,6 @@ fn main() {
   build.cpp(true).file("skia-c/skia_c.cpp");
 
   match compile_target.as_str() {
-    "aarch64-unknown-linux-gnu" => {
-      build
-        .flag("--sysroot=/usr/aarch64-linux-gnu")
-        .flag("--gcc-toolchain=aarch64-linux-gnu-gcc")
-        .include("/usr/aarch64-linux-gnu/include/c++/7")
-        .include("/usr/aarch64-linux-gnu/include/c++/7/aarch64-linux-gnu");
-    }
     "aarch64-unknown-linux-musl" => {
       let gcc_version = String::from_utf8(
         process::Command::new("ls")
@@ -189,7 +182,6 @@ fn main() {
           println!("cargo:rustc-link-search=/usr/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/sysroot/lib");
           println!("cargo:rustc-link-search=/usr/aarch64-unknown-linux-gnu/lib/gcc/aarch64-unknown-linux-gnu/4.8.5");
         } else {
-          println!("cargo:rustc-link-lib=static=c++abi");
           println!("cargo:rustc-link-search=/usr/lib/llvm-14/lib");
         }
       }

diff --git a/skia-c/skia_c.cpp b/skia-c/skia_c.cpp
@@ -277,12 +277,26 @@ extern "C"
     CANVAS_CAST->drawColor(SkColor4f{r, g, b, a});
   }
 
-  void skiac_canvas_draw_image(skiac_canvas *c_canvas, skiac_bitmap *c_bitmap, float sx, float sy, float s_width, float s_height, float dx, float dy, float d_width, float d_height, skiac_paint *c_paint)
+  void skiac_canvas_draw_image(
+      skiac_canvas *c_canvas,
+      skiac_bitmap *c_bitmap,
+      float sx,
+      float sy,
+      float s_width,
+      float s_height,
+      float dx,
+      float dy,
+      float d_width,
+      float d_height,
+      bool enable_smoothing,
+      int filter_quality,
+      skiac_paint *c_paint)
   {
     const auto src_rect = SkRect::MakeXYWH(sx, sy, s_width, s_height);
     const auto dst_rect = SkRect::MakeXYWH(dx, dy, d_width, d_height);
     auto sk_image = SkImage::MakeFromBitmap(*BITMAP_CAST);
-    const auto sampling = SkSamplingOptions(SkCubicResampler::Mitchell());
+    auto fq = enable_smoothing ? filter_quality : 0;
+    const auto sampling = SamplingOptionsFromFQ(fq);
     auto paint = reinterpret_cast<const SkPaint *>(c_paint);
     CANVAS_CAST->drawImageRect(sk_image, src_rect, dst_rect, sampling, paint, SkCanvas::kFast_SrcRectConstraint);
   }

diff --git a/skia-c/skia_c.hpp b/skia-c/skia_c.hpp
@@ -245,7 +245,20 @@ extern "C"
   skiac_transform skiac_canvas_get_total_transform(skiac_canvas *c_canvas);
   skiac_matrix *skiac_canvas_get_total_transform_matrix(skiac_canvas *c_canvas);
   void skiac_canvas_draw_color(skiac_canvas *c_canvas, float r, float g, float b, float a);
-  void skiac_canvas_draw_image(skiac_canvas *c_canvas, skiac_bitmap *c_bitmap, float sx, float sy, float s_width, float s_height, float dx, float dy, float d_width, float d_height, skiac_paint *c_paint);
+  void skiac_canvas_draw_image(
+      skiac_canvas *c_canvas,
+      skiac_bitmap *c_bitmap,
+      float sx,
+      float sy,
+      float s_width,
+      float s_height,
+      float dx,
+      float dy,
+      float d_width,
+      float d_height,
+      bool enable_smoothing,
+      int filter_quality,
+      skiac_paint *c_paint);
   void skiac_canvas_draw_path(skiac_canvas *c_canvas, skiac_path *c_path, skiac_paint *c_paint);
   void skiac_canvas_draw_rect(
       skiac_canvas *c_canvas,

diff --git a/src/ctx.rs b/src/ctx.rs
@@ -711,11 +711,24 @@ impl Context {
         dy,
         d_width,
         d_height,
+        self.state.image_smoothing_enabled,
+        self.state.image_smoothing_quality,
         &drop_shadow_paint,
       );
     }
     self.surface.canvas.draw_image(
-      bitmap, sx, sy, s_width, s_height, dx, dy, d_width, d_height, &paint,
+      bitmap,
+      sx,
+      sy,
+      s_width,
+      s_height,
+      dx,
+      dy,
+      d_width,
+      d_height,
+      self.state.image_smoothing_enabled,
+      self.state.image_smoothing_quality,
+      &paint,
     );
 
     Ok(())

diff --git a/src/sk.rs b/src/sk.rs
@@ -347,6 +347,8 @@ mod ffi {
       dy: f32,
       d_width: f32,
       d_height: f32,
+      enable_smoothing: bool,
+      filter_quality: i32,
       paint: *mut skiac_paint,
     );
 
@@ -1251,6 +1253,7 @@ impl From<i32> for BlendMode {
   }
 }
 
+#[repr(i32)]
 #[derive(Copy, Clone, PartialEq, Eq, Hash, Debug)]
 pub enum FilterQuality {
   None = 0,
@@ -1993,11 +1996,25 @@ impl Canvas {
     dy: f32,
     d_width: f32,
     d_height: f32,
+    enable_smoothing: bool,
+    quality: FilterQuality,
     paint: &Paint,
   ) {
     unsafe {
       ffi::skiac_canvas_draw_image(
-        self.0, image, sx, sy, s_width, s_height, dx, dy, d_width, d_height, paint.0,
+        self.0,
+        image,
+        sx,
+        sy,
+        s_width,
+        s_height,
+        dx,
+        dy,
+        d_width,
+        d_height,
+        enable_smoothing,
+        quality as i32,
+        paint.0,
       );
     }
   }