update wasm

Author: evanwashere

ImageScript.js

@@ -1238,7 +1238,7 @@ export class Image {
             max_width: Infinity === wrapWidth ? null : wrapWidth,
         });
 
-        layout.append(font, text, scale);
+        layout.append(font, text, { scale });
         const framebuffer = layout.rasterize(r, g, b);
         const image = new this(framebuffer.width, framebuffer.height);
 

utils/wasm/font.js

@@ -10,11 +10,11 @@ let registry = null;
 }
 
 class mem {
+  static length() { return wasm.wlen(); }
   static alloc(size) { return wasm.walloc(size); }
   static free(ptr, size) { return wasm.wfree(ptr, size); }
   static u8(ptr, size) { return new Uint8Array(wasm.memory.buffer, ptr, size); }
   static u32(ptr, size) { return new Uint32Array(wasm.memory.buffer, ptr, size); }
-  static length() { return new Uint32Array(wasm.memory.buffer, wasm.cur_len.value, 1)[0]; }
 
   static copy_and_free(ptr, size) {
     let slice = mem.u8(ptr, size).slice();
@@ -109,12 +109,14 @@ export class Layout {
     wasm.layout_reset(this.ptr, ptr, options.length);
   }
 
-  append(font, text, scale) {
+  append(font, text, init) {
     text = encode_utf8(text);
+    const options = init || {};
     if (registry) this.refs.push(font);
     const ptr = mem.alloc(text.length);
     mem.u8(ptr, text.length).set(text);
-    wasm.layout_append(this.ptr, font.ptr, ptr, text.length, scale ?? font.scale);
+    const has_color = ('r' in options) || ('g' in options) || ('b' in options);
+    wasm.layout_append(this.ptr, font.ptr, ptr, text.length, options.scale ?? font.scale, has_color, options.r, options.g, options.b);
   }
 
   rasterize(r, g, b) {

utils/wasm/font.wasm

@@ -16,11 +16,11 @@ const streams = new Map;
 }
 
 class mem {
+  static length() { return wasm.wlen(); }
   static alloc(size) { return wasm.walloc(size); }
   static free(ptr, size) { return wasm.wfree(ptr, size); }
   static u8(ptr, size) { return new Uint8Array(wasm.memory.buffer, ptr, size); }
   static u32(ptr, size) { return new Uint32Array(wasm.memory.buffer, ptr, size); }
-  static length() { return new Uint32Array(wasm.memory.buffer, wasm.cur_len.value, 1)[0]; }
 
   static copy_and_free(ptr, size) {
     let slice = mem.u8(ptr, size).slice();

utils/wasm/gif.js

@@ -9,11 +9,11 @@ let wasm;
 }
 
 class mem {
+  static length() { return wasm.wlen(); }
   static alloc(size) { return wasm.walloc(size); }
   static free(ptr, size) { return wasm.wfree(ptr, size); }
   static u8(ptr, size) { return new Uint8Array(wasm.memory.buffer, ptr, size); }
   static u32(ptr, size) { return new Uint32Array(wasm.memory.buffer, ptr, size); }
-  static length() { return new Uint32Array(wasm.memory.buffer, wasm.cur_len.value, 1)[0]; }
 
   static copy_and_free(ptr, size) {
     let slice = mem.u8(ptr, size).slice();

utils/wasm/gif.wasm

@@ -9,11 +9,11 @@ let wasm;
 }
 
 class mem {
+  static length() { return wasm.wlen(); }
   static alloc(size) { return wasm.walloc(size); }
   static free(ptr, size) { return wasm.wfree(ptr, size); }
   static u8(ptr, size) { return new Uint8Array(wasm.memory.buffer, ptr, size); }
   static u32(ptr, size) { return new Uint32Array(wasm.memory.buffer, ptr, size); }
-  static length() { return new Uint32Array(wasm.memory.buffer, wasm.cur_len.value, 1)[0]; }
 
   static copy_and_free(ptr, size) {
     let slice = mem.u8(ptr, size).slice();

utils/wasm/jpeg.js

@@ -9,11 +9,11 @@ let wasm;
 }
 
 class mem {
+  static length() { return wasm.wlen(); }
   static alloc(size) { return wasm.walloc(size); }
   static free(ptr, size) { return wasm.wfree(ptr, size); }
   static u8(ptr, size) { return new Uint8Array(wasm.memory.buffer, ptr, size); }
   static u32(ptr, size) { return new Uint32Array(wasm.memory.buffer, ptr, size); }
-  static length() { return new Uint32Array(wasm.memory.buffer, wasm.cur_len.value, 1)[0]; }
 
   static copy_and_free(ptr, size) {
     let slice = mem.u8(ptr, size).slice();