fix: ensure ICU base path on Windows, initialize pixel buffer correctly, fix segmentation fault on macOS Intel (#46)

* some fixes

* maybe fix

* fmt

* temp

* fmt

* x

* fix??

* pls

* fmt

* why dont it work

* fmt

* ci: remove prebuilt test

Author: DjDeveloperr

.github/workflows/ci.yml

@@ -88,7 +88,7 @@ jobs:
       - name: Run Tests
         env:
           DENO_SKIA_LOCAL: 1
-        run: deno run -A --unstable ./test/test.ts
+        run: deno run -A --unstable test/test.ts
 
       - name: Release
         uses: softprops/action-gh-release@master

deno.json

@@ -7,6 +7,7 @@
     "build": "cd native/build && CC=clang CXX=clang++ cmake .. && cmake --build . --config Release",
     "build-win": "rm -rf native/build && mkdir native/build && cd native/build && cmake .. -G \"Visual Studio 17 2022\" -T ClangCL && cmake --build . --config Release",
     "test": "deno run -A --unstable ./test/test.ts",
+    "test-prebuilt": "deno run -A --unstable --import-map=./test/import_map.json ./test/test.ts",
     "test-pdf": "deno run -A --unstable ./test/pdf.ts",
     "test-svg": "deno run -A --unstable ./test/svg.ts",
     "bench-deno": "deno bench -A --unstable bench/deno.js",
@@ -17,7 +18,7 @@
 
   "fmt": {
     "files": {
-      "exclude": ["skia", "bench/node_modules", "build"]
+      "exclude": ["skia", "bench/node_modules", "build", "native/build"]
     }
   }
 }

native/include/canvas.hpp

@@ -13,11 +13,16 @@
 #include "include/gpu/GrDirectContext.h"
 #include "include/gpu/gl/GrGLInterface.h"
 
+typedef enum sk_canvas_backend {
+  kBackendCPU,
+  kBackendOpenGL,
+} sk_canvas_backend;
+
 typedef struct sk_canvas {
   SkSurface* surface;
   GrDirectContext* context;
-  void* pixels;
   void* context_2d;
+  sk_canvas_backend backend;
 } sk_canvas;
 
 typedef struct sk_context_state {

native/src/canvas.cpp

@@ -8,17 +8,16 @@ extern "C" {
 
   sk_canvas* sk_canvas_create(int width, int height) {
     sk_canvas* canvas = new sk_canvas();
-    SkImageInfo info = SkImageInfo::MakeN32Premul(width, height);
-    size_t rowBytes = info.minRowBytes();
-    size_t size = info.computeByteSize(rowBytes);
-    canvas->pixels = malloc(size);
-    canvas->surface = SkSurface::MakeRasterDirect(info, canvas->pixels, rowBytes).release();
+    canvas->backend = kBackendCPU;
+    canvas->surface = SkSurface::MakeRasterN32Premul(width, height).release();
     canvas->context_2d = sk_canvas_create_context(canvas);
     return canvas;
   }
 
   sk_canvas* sk_canvas_create_gl(int width, int height) {
     sk_canvas* canvas = new sk_canvas();
+    canvas->backend = kBackendOpenGL;
+    
     auto interface = GrGLMakeNativeInterface();
 
     if (interface == nullptr) {
@@ -63,9 +62,6 @@ extern "C" {
   void sk_canvas_destroy(sk_canvas* canvas) {
     canvas->surface->unref();
     sk_context_destroy((sk_context*) canvas->context_2d);
-    if (canvas->pixels != nullptr) {
-      free(canvas->pixels);
-    }
     delete canvas;
   }
 
@@ -121,18 +117,13 @@ extern "C" {
   }
 
   void sk_canvas_set_size(sk_canvas* canvas, int width, int height) {
-    if (canvas->pixels != nullptr) {
+    if (canvas->backend == kBackendCPU) {
       // Raster canvas
       canvas->surface->unref();
       sk_context_destroy((sk_context*) canvas->context_2d);
-      free(canvas->pixels);
-      SkImageInfo info = SkImageInfo::MakeN32Premul(width, height);
-      size_t rowBytes = info.minRowBytes();
-      size_t size = info.computeByteSize(rowBytes);
-      canvas->pixels = malloc(size);
-      canvas->surface = SkSurface::MakeRasterDirect(info, canvas->pixels, rowBytes).release();
+      canvas->surface = SkSurface::MakeRasterN32Premul(width, height).release();
       canvas->context_2d = sk_canvas_create_context(canvas);
-    } else {
+    } else if (canvas->backend == kBackendOpenGL) {
       // OpenGL canvas
       canvas->surface->unref();
       sk_context_destroy((sk_context*) canvas->context_2d);

native/src/context2d.cpp

@@ -9,7 +9,7 @@ extern sk_sp<skia::textlayout::FontCollection> fontCollection;
 
 void free_style(Style* style) {
   if (style->shader != nullptr) {
-    style->shader.~sk_sp();
+    style->shader->unref();
   }
 }
 
@@ -100,7 +100,7 @@ sk_context_state* clone_context_state(sk_context_state* state) {
 void free_context_state(sk_context_state* state) {
   free_style(&state->fillStyle);
   free_style(&state->strokeStyle);
-  if (state->filter.get() != nullptr) state->filter.~sk_sp();
+  if (state->filter.get() != nullptr) state->filter->unref();
   delete state->paint;
   delete state->transform;
   free_font(state->font);
@@ -1213,6 +1213,7 @@ extern "C" {
   /// Filters
 
   void sk_context_filter_reset(sk_context* context) {
+    if (context->state->filter.get() != nullptr) context->state->filter->unref();
     context->state->filter = sk_sp((SkImageFilter*) nullptr);
   }
 

native/src/pattern.cpp

@@ -45,6 +45,8 @@ extern "C" {
   }
 
   sk_sp<SkShader> sk_pattern_to_shader(sk_pattern* pattern) {
-    return pattern->bitmap->makeShader(pattern->tmx, pattern->tmy, SkSamplingOptions({1.0f / 3.0f, 1.0f / 3.0f}), &pattern->ts);
+    auto shader = pattern->bitmap->makeShader(pattern->tmx, pattern->tmy, SkSamplingOptions({1.0f / 3.0f, 1.0f / 3.0f}), &pattern->ts);
+    shader->ref();
+    return shader;
   }
 }

src/canvas.ts

@@ -1,5 +1,5 @@
 import { CanvasRenderingContext2D } from "./context2d.ts";
-import ffi, { cstr, getBuffer } from "./ffi.ts";
+import ffi, { cstr, encodeBase64, getBuffer } from "./ffi.ts";
 import { ColorSpace } from "./image.ts";
 
 const {
@@ -139,9 +139,7 @@ export class Canvas {
 
   toDataURL(format: ImageFormat = "png", quality = 100) {
     const buffer = this.encode(format, quality);
-    return `data:image/${format};base64,${
-      (Deno as any).core.ops.op_base64_encode(buffer)
-    }`;
+    return `data:image/${format};base64,${encodeBase64(buffer)}`;
   }
 
   /**

src/ffi.ts

@@ -944,7 +944,11 @@ if (LOCAL_BUILD) {
       }
 
       await ensureDir(dirname(cacheIcuBasePath));
-
+      try {
+        await Deno.mkdir(cacheIcuBasePath, { recursive: true });
+      } catch (_) {
+        // ignore if already exists
+      }
       await Deno.writeFile(
         cacheIcuPath,
         new Uint8Array(await response.arrayBuffer()),
@@ -964,17 +968,26 @@ export default lib;
 const {
   op_ffi_cstr_read,
   op_ffi_get_buf,
+  op_base64_encode,
+  op_base64_decode,
 }: {
   op_ffi_cstr_read: (ptr: Deno.PointerValue) => string;
   op_ffi_get_buf: (
     ptr: Deno.PointerValue,
     offset: number,
     size: number,
   ) => ArrayBuffer;
-} = (Deno as any).core.ops;
+  op_base64_encode: (buf: Uint8Array) => string;
+  op_base64_decode: (base64: string) => Uint8Array;
+} = (Deno as any)[(Deno as any).internal].core.ops;
 
 export function cstr(str: string) {
   return new TextEncoder().encode(str + "\0");
 }
 
-export { op_ffi_cstr_read as readCstr, op_ffi_get_buf as getBuffer };
+export {
+  op_base64_decode as decodeBase64,
+  op_base64_encode as encodeBase64,
+  op_ffi_cstr_read as readCstr,
+  op_ffi_get_buf as getBuffer,
+};

src/image.ts

@@ -1,4 +1,4 @@
-import ffi, { cstr } from "./ffi.ts";
+import ffi, { cstr, decodeBase64 } from "./ffi.ts";
 
 const {
   sk_image_destroy,
@@ -68,7 +68,7 @@ export class Image extends EventTarget {
         const isBase64 = data.lastIndexOf("base64", comma) !== -1;
         const content = data.slice(comma + 1);
         const buffer = isBase64
-          ? (Deno as any).core.ops.op_base64_decode(content)
+          ? decodeBase64(content)
           : new TextEncoder().encode(content);
         this.src = buffer;
         return;

test/import_map.json

@@ -0,0 +1,5 @@
+{
+  "imports": {
+    "../": "../"
+  }
+}