.github/workflows/ci.yaml

@@ -6,15 +6,14 @@ on:
   pull_request:
     paths-ignore:
       - ".github/workflows/prebuild.yaml"
-
 
 jobs: 
   Linux:
     name: Test on Linux
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: [10, 12, 14]
+        node: [10, 12, 14, 16]
     steps:
       - uses: actions/setup-node@v1
         with:
@@ -34,15 +33,15 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        node: [10, 12, 14]
+        node: [10, 12, 14, 16]
     steps:
       - uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node }}
       - uses: actions/checkout@v2
       - name: Install Dependencies
         run: |
-          Invoke-WebRequest "http://ftp.gnome.org/pub/GNOME/binaries/win64/gtk+/2.22/gtk+-bundle_2.22.1-20101229_win64.zip" -OutFile "gtk.zip"
+          Invoke-WebRequest "https://ftp-osl.osuosl.org/pub/gnome/binaries/win64/gtk+/2.22/gtk+-bundle_2.22.1-20101229_win64.zip" -OutFile "gtk.zip"
           Expand-Archive gtk.zip -DestinationPath "C:\GTK"
           Invoke-WebRequest "https://downloads.sourceforge.net/project/libjpeg-turbo/2.0.4/libjpeg-turbo-2.0.4-vc64.exe" -OutFile "libjpeg.exe" -UserAgent NativeHost
           .\libjpeg.exe /S
@@ -56,7 +55,7 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        node: [10, 12, 14]
+        node: [10, 12, 14, 16]
     steps:
       - uses: actions/setup-node@v1
         with:
@@ -77,7 +76,7 @@ jobs:
     steps:
       - uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: 14
       - uses: actions/checkout@v2
       - name: Install
         run: npm install --ignore-scripts

CHANGELOG.md

@@ -11,6 +11,30 @@ project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 ### Fixed
 
+2.8.0
+==================
+### Changed
+* Upgrade dtslint
+* Upgrade node-pre-gyp to 1.0.0. Note that if you are using special node-pre-gyp
+  features like `node_pre_gyp_accessKeyId`, you may need to make changes to your
+  installation procedure. See https://github.com/mapbox/node-pre-gyp/blob/master/CHANGELOG.md#100.
+* Add Node.js v16 to CI.
+* The C++ class method `nBytes()` now returns a size_t. (Because this is a C++
+  method only, this is not considered a breaking change.)
+* Export type NodeCanvasRenderingContext2D so you can pass the current context
+  to functions (TypeScript).
+### Added
+* Add support for  `inverse()` and `invertSelf()` to `DOMMatrix` (#1648)
+* Add support for `context.getTransform()` ([#1769](https://github.com/Automattic/node-canvas/pull/1769))
+* Add support for `context.setTransform(dommatrix)` ([#1769](https://github.com/Automattic/node-canvas/pull/1769))
+### Fixed
+* Fix `actualBoundingBoxLeft` and `actualBoundingBoxRight` returned by `measureText` to be the ink rect ([#1776](https://github.com/Automattic/node-canvas/pull/1776), fixes [#1703](https://github.com/Automattic/node-canvas/issues/1703)).
+* Fix Pango logging "expect ugly output" on Windows (#1643)
+* Fix benchmark for createPNGStream (#1672)
+* Fix dangling reference in BackendOperationNotAvailable exception (#1740)
+* Fix always-false comparison warning in Canvas.cc.
+* Fix Node.js crash when throwing from an onload or onerror handler.
+
 2.7.0
 ==================
 ### Changed

benchmarks/run.js

@@ -157,7 +157,7 @@ bm('getImageData(0,0,100,100)', function () {
 })
 
 bm('PNGStream 200x200', function (done) {
-  var stream = canvas.createSyncPNGStream()
+  var stream = canvas.createPNGStream()
   stream.on('data', function (chunk) {
     // whatever
   })

lib/DOMMatrix.js

@@ -425,7 +425,7 @@ DOMMatrix.prototype.skewYSelf = function (sy) {
   return this
 }
 
-DOMMatrix.prototype.flipX = function () { 
+DOMMatrix.prototype.flipX = function () {
   return newInstance(multiply([
     -1, 0, 0, 0,
     0, 1, 0, 0,
@@ -446,8 +446,135 @@ DOMMatrix.prototype.inverse = function () {
   return newInstance(this._values).invertSelf()
 }
 DOMMatrix.prototype.invertSelf = function () {
-  // If not invertible, set all attributes to NaN and is2D to false
-  throw new Error('Not implemented')
+  var m = this._values;
+  var inv = m.map(v => 0);
+
+  inv[0] = m[5]  * m[10] * m[15] -
+          m[5]  * m[11] * m[14] -
+          m[9]  * m[6]  * m[15] +
+          m[9]  * m[7]  * m[14] +
+          m[13] * m[6]  * m[11] -
+          m[13] * m[7]  * m[10];
+
+  inv[4] = -m[4]  * m[10] * m[15] +
+          m[4]  * m[11] * m[14] +
+          m[8]  * m[6]  * m[15] -
+          m[8]  * m[7]  * m[14] -
+          m[12] * m[6]  * m[11] +
+          m[12] * m[7]  * m[10];
+
+  inv[8] = m[4]  * m[9] * m[15] -
+          m[4]  * m[11] * m[13] -
+          m[8]  * m[5] * m[15] +
+          m[8]  * m[7] * m[13] +
+          m[12] * m[5] * m[11] -
+          m[12] * m[7] * m[9];
+
+  inv[12] = -m[4]  * m[9] * m[14] +
+          m[4]  * m[10] * m[13] +
+          m[8]  * m[5] * m[14] -
+          m[8]  * m[6] * m[13] -
+          m[12] * m[5] * m[10] +
+          m[12] * m[6] * m[9];
+
+  // If the determinant is zero, this matrix cannot be inverted, and all
+  // values should be set to NaN, with the is2D flag set to false.
+
+  var det = m[0] * inv[0] + m[1] * inv[4] + m[2] * inv[8] + m[3] * inv[12];
+
+  if (det === 0) {
+    this._values = m.map(v => NaN);
+    this._is2D = false;
+    return this;
+  }
+
+  inv[1] = -m[1]  * m[10] * m[15] +
+          m[1]  * m[11] * m[14] +
+          m[9]  * m[2] * m[15] -
+          m[9]  * m[3] * m[14] -
+          m[13] * m[2] * m[11] +
+          m[13] * m[3] * m[10];
+
+  inv[5] = m[0]  * m[10] * m[15] -
+          m[0]  * m[11] * m[14] -
+          m[8]  * m[2] * m[15] +
+          m[8]  * m[3] * m[14] +
+          m[12] * m[2] * m[11] -
+          m[12] * m[3] * m[10];
+
+  inv[9] = -m[0]  * m[9] * m[15] +
+          m[0]  * m[11] * m[13] +
+          m[8]  * m[1] * m[15] -
+          m[8]  * m[3] * m[13] -
+          m[12] * m[1] * m[11] +
+          m[12] * m[3] * m[9];
+
+  inv[13] = m[0]  * m[9] * m[14] -
+          m[0]  * m[10] * m[13] -
+          m[8]  * m[1] * m[14] +
+          m[8]  * m[2] * m[13] +
+          m[12] * m[1] * m[10] -
+          m[12] * m[2] * m[9];
+
+  inv[2] = m[1]  * m[6] * m[15] -
+          m[1]  * m[7] * m[14] -
+          m[5]  * m[2] * m[15] +
+          m[5]  * m[3] * m[14] +
+          m[13] * m[2] * m[7] -
+          m[13] * m[3] * m[6];
+
+  inv[6] = -m[0]  * m[6] * m[15] +
+          m[0]  * m[7] * m[14] +
+          m[4]  * m[2] * m[15] -
+          m[4]  * m[3] * m[14] -
+          m[12] * m[2] * m[7] +
+          m[12] * m[3] * m[6];
+
+  inv[10] = m[0]  * m[5] * m[15] -
+          m[0]  * m[7] * m[13] -
+          m[4]  * m[1] * m[15] +
+          m[4]  * m[3] * m[13] +
+          m[12] * m[1] * m[7] -
+          m[12] * m[3] * m[5];
+
+  inv[14] = -m[0]  * m[5] * m[14] +
+          m[0]  * m[6] * m[13] +
+          m[4]  * m[1] * m[14] -
+          m[4]  * m[2] * m[13] -
+          m[12] * m[1] * m[6] +
+          m[12] * m[2] * m[5];
+
+  inv[3] = -m[1] * m[6] * m[11] +
+          m[1] * m[7] * m[10] +
+          m[5] * m[2] * m[11] -
+          m[5] * m[3] * m[10] -
+          m[9] * m[2] * m[7] +
+          m[9] * m[3] * m[6];
+
+  inv[7] = m[0] * m[6] * m[11] -
+          m[0] * m[7] * m[10] -
+          m[4] * m[2] * m[11] +
+          m[4] * m[3] * m[10] +
+          m[8] * m[2] * m[7] -
+          m[8] * m[3] * m[6];
+
+  inv[11] = -m[0] * m[5] * m[11] +
+          m[0] * m[7] * m[9] +
+          m[4] * m[1] * m[11] -
+          m[4] * m[3] * m[9] -
+          m[8] * m[1] * m[7] +
+          m[8] * m[3] * m[5];
+
+  inv[15] = m[0] * m[5] * m[10] -
+          m[0] * m[6] * m[9] -
+          m[4] * m[1] * m[10] +
+          m[4] * m[2] * m[9] +
+          m[8] * m[1] * m[6] -
+          m[8] * m[2] * m[5];
+
+  inv.forEach((v,i) => inv[i] = v/det);
+  this._values = inv;
+  return this
 }
 
 DOMMatrix.prototype.setMatrixValue = function (transformList) {
@@ -471,11 +598,11 @@ DOMMatrix.prototype.transformPoint = function (point) {
   return new DOMPoint(nx, ny, nz, nw)
 }
 
-DOMMatrix.prototype.toFloat32Array = function () { 
+DOMMatrix.prototype.toFloat32Array = function () {
   return Float32Array.from(this._values)
 }
 
-DOMMatrix.prototype.toFloat64Array = function () { 
+DOMMatrix.prototype.toFloat64Array = function () {
   return this._values.slice(0)
 }
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "canvas",
   "description": "Canvas graphics API backed by Cairo",
-  "version": "2.7.0",
+  "version": "2.8.0",
   "author": "TJ Holowaychuk <tj@learnboost.com>",
   "main": "index.js",
   "browser": "browser.js",
@@ -49,17 +49,18 @@
   "types": "types/index.d.ts",
   "dependencies": {
     "nan": "^2.14.0",
-    "node-pre-gyp": "^0.15.0",
+    "@mapbox/node-pre-gyp": "^1.0.0",
     "simple-get": "^3.0.3"
   },
   "devDependencies": {
     "@types/node": "^10.12.18",
     "assert-rejects": "^1.0.0",
-    "dtslint": "^0.5.3",
+    "dtslint": "^4.0.7",
     "express": "^4.16.3",
     "mocha": "^5.2.0",
     "pixelmatch": "^4.0.2",
-    "standard": "^12.0.1"
+    "standard": "^12.0.1",
+    "typescript": "^4.2.2"
   },
   "engines": {
     "node": ">=6"

prebuild/Linux/Dockerfile

@@ -0,0 +1,43 @@
+FROM debian:stretch
+RUN apt-get update && apt-get -y install curl git cmake make gcc g++ nasm wget gperf bzip2 meson uuid-dev perl libxml-parser-perl
+
+RUN bash -c 'cd; curl -LO https://pkg-config.freedesktop.org/releases/pkg-config-0.29.2.tar.gz; tar -xvf pkg-config-0.29.2.tar.gz; cd pkg-config-0.29.2; ./configure --with-internal-glib; make; make install'
+RUN bash -c 'cd; curl -O https://zlib.net/fossils/zlib-1.2.11.tar.gz; tar -xvf zlib-1.2.11.tar.gz; cd zlib-1.2.11; ./configure; make; make install'
+RUN bash -c 'cd; curl -LO https://github.com/libffi/libffi/releases/download/v3.3/libffi-3.3.tar.gz; tar -xvf libffi-3.3.tar.gz; cd libffi-3.3; ./configure; make; make install'
+RUN bash -c 'cd; curl -O https://www.openssl.org/source/openssl-1.1.1i.tar.gz; tar -xvf openssl-1.1.1i.tar.gz; cd openssl-1.1.1i; ./config; make; make install'
+RUN ldconfig
+RUN bash -c 'cd; curl -O https://www.python.org/ftp/python/3.9.1/Python-3.9.1.tgz; tar -xvf Python-3.9.1.tgz; cd Python-3.9.1; ./configure --enable-shared --with-ensurepip=yes; make; make install'
+RUN ldconfig
+RUN pip3 install meson
+RUN bash -c 'cd; curl -LO https://download.sourceforge.net/giflib/giflib-5.2.1.tar.gz; tar -xvf giflib-5.2.1.tar.gz; cd giflib-5.2.1; ./configure; make; make install'
+RUN bash -c 'cd; curl -LO https://download.sourceforge.net/libpng/libpng-1.6.37.tar.gz; tar -xvf libpng-1.6.37.tar.gz; cd libpng-1.6.37; ./configure; make; make install'
+RUN bash -c 'cd; curl -LO https://github.com/libjpeg-turbo/libjpeg-turbo/archive/2.0.6.tar.gz; tar -xvf 2.0.6.tar.gz; cd libjpeg-turbo-2.0.6; mkdir b; cd b; cmake -G"Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr/local ..; make; make install'
+RUN bash -c 'cd; curl -O https://ftp.pcre.org/pub/pcre/pcre-8.44.tar.bz2; tar -xvf pcre-8.44.tar.bz2; cd pcre-8.44; ./configure --enable-pcre16 --enable-pcre32 --enable-utf --enable-unicode-properties; make; make install '
+RUN ldconfig
+RUN bash -c 'cd; curl -LO https://download.gnome.org/sources/glib/2.67/glib-2.67.1.tar.xz; tar -xvf glib-2.67.1.tar.xz; cd glib-2.67.1; meson _build; cd _build; ninja; ninja install'
+RUN ldconfig
+RUN bash -c 'cd; curl -LO https://download.sourceforge.net/freetype/freetype-2.10.4.tar.gz; tar -xvf freetype-2.10.4.tar.gz; cd freetype-2.10.4; ./configure; make; make install'
+RUN bash -c 'cd; curl -LO https://github.com/harfbuzz/harfbuzz/releases/download/2.7.4/harfbuzz-2.7.4.tar.xz; tar -xvf harfbuzz-2.7.4.tar.xz; cd harfbuzz-2.7.4; ./configure; make; make install;'
+RUN bash -c 'cd; curl -LO https://github.com/libexpat/libexpat/releases/download/R_2_2_10/expat-2.2.10.tar.gz; tar -xvf expat-2.2.10.tar.gz; cd expat-2.2.10; ./configure; make; make install'
+RUN ldconfig
+RUN ls -l /usr/include
+RUN bash -c 'cd; curl -O https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.1.tar.bz2; tar -xvf fontconfig-2.13.1.tar.bz2; cd fontconfig-2.13.1; UUID_LIBS="-L/lib/x86_64-linux-gnu -luuid" UUID_CFLAGS="-I/include" ./configure --enable-static --sysconfdir=/etc --localstatedir=/var; make; make install'
+RUN bash -c 'cd; curl -O https://www.cairographics.org/releases/pixman-0.40.0.tar.gz; tar -xvf pixman-0.40.0.tar.gz; cd pixman-0.40.0; ./configure; make; make install'
+RUN bash -c 'cd; curl -O https://cairographics.org/releases/cairo-1.16.0.tar.xz; tar -xvf cairo-1.16.0.tar.xz; cd cairo-1.16.0; ./configure; make; make install'
+RUN bash -c 'cd; curl -LO https://github.com/fribidi/fribidi/releases/download/v1.0.10/fribidi-1.0.10.tar.xz; tar -xvf fribidi-1.0.10.tar.xz; cd fribidi-1.0.10; ./configure; make; make install'
+RUN bash -c 'cd; curl -LO https://download.gnome.org/sources/pango/1.48/pango-1.48.0.tar.xz; tar -xvf pango-1.48.0.tar.xz; cd pango-1.48.0; meson -Dharfbuzz:docs=disabled -Dgtk_doc=false _build; cd _build; ninja; ninja install'
+RUN ldconfig
+
+# librsvg
+RUN bash -c 'curl https://sh.rustup.rs -sSf | sh -s -- -y';
+RUN bash -c 'curl -O http://xmlsoft.org/sources/libxml2-2.9.10.tar.gz; tar -xvf libxml2-2.9.10.tar.gz; cd libxml2-2.9.10; ./configure --without-python; make; make install'
+RUN bash -c 'curl -O https://ftp.gnu.org/pub/gnu/gettext/gettext-0.21.tar.gz; tar -xvf gettext-0.21.tar.gz; cd gettext-0.21; ./configure; make; make install'
+RUN ldconfig
+RUN bash -c 'curl -LO https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz; tar -xvf intltool-0.51.0.tar.gz; cd intltool-0.51.0; ./configure; make; make install'
+# using an old version of shared-mime-info because 2.1 has a ridiculous number of dependencies for what is essentially just a database
+RUN bash -c 'curl -O https://people.freedesktop.org/~hadess/shared-mime-info-1.8.tar.xz; tar -xvf shared-mime-info-1.8.tar.xz; cd shared-mime-info-1.8; ./configure; make; make install'
+RUN bash -c 'curl -LO https://download.gnome.org/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.2.tar.xz; tar -xvf gdk-pixbuf-2.42.2.tar.xz; cd gdk-pixbuf-2.42.2; meson _build; cd _build; ninja install';
+RUN ldconfig
+RUN bash -c 'curl -LO https://download.gnome.org/sources/libcroco/0.6/libcroco-0.6.13.tar.xz; tar -xvf libcroco-0.6.13.tar.xz; cd libcroco-0.6.13; ./configure; make; make install'
+RUN bash -c 'cd; . .cargo/env; curl -LO https://download.gnome.org/sources/librsvg/2.50/librsvg-2.50.2.tar.xz; tar -xvf librsvg-2.50.2.tar.xz; cd librsvg-2.50.2; ./configure --enable-introspection=no; make; make install'
+RUN ldconfig

src/Canvas.cc

@@ -408,7 +408,7 @@ NAN_METHOD(Canvas::ToBuffer) {
   if (info[0]->StrictEquals(Nan::New<String>("raw").ToLocalChecked())) {
     cairo_surface_t *surface = canvas->surface();
     cairo_surface_flush(surface);
-    if (static_cast<uint32_t>(canvas->nBytes()) > node::Buffer::kMaxLength) {
+    if (canvas->nBytes() > node::Buffer::kMaxLength) {
       Nan::ThrowError("Data exceeds maximum buffer length.");
       return;
     }
@@ -597,6 +597,9 @@ streamPDF(void *c, const uint8_t *data, unsigned len) {
   Nan::HandleScope scope;
   Nan::AsyncResource async("canvas:StreamPDF");
   PdfStreamInfo* streaminfo = static_cast<PdfStreamInfo*>(c);
+  // TODO this is technically wrong, we're returning a pointer to the data in a
+  // vector in a class with automatic storage duration. If the canvas goes out
+  // of scope while we're in the handler, a use-after-free could happen.
   Local<Object> buf = Nan::NewBuffer(const_cast<char *>(reinterpret_cast<const char *>(data)), len, stream_pdf_free, 0).ToLocalChecked();
   Local<Value> argv[3] = {
       Nan::Null()
@@ -837,12 +840,6 @@ Canvas::GetWeightFromCSSString(const char *weight) {
   return w;
 }
 
-bool streq_casein(std::string& str1, std::string& str2) {
-  return str1.size() == str2.size() && std::equal(str1.begin(), str1.end(), str2.begin(), [](char& c1, char& c2) {
-    return c1 == c2 || std::toupper(c1) == std::toupper(c2);
-  });
-}
-
 /*
  * Given a user description, return a description that will select the
  * font either from the system or @font-face

src/Canvas.h

@@ -9,6 +9,7 @@
 #include <pango/pangocairo.h>
 #include <v8.h>
 #include <vector>
+#include <cstddef>
 
 /*
  * Maxmimum states per context.
@@ -63,7 +64,9 @@ class Canvas: public Nan::ObjectWrap {
 
     DLL_PUBLIC inline uint8_t *data(){ return cairo_image_surface_get_data(surface()); }
     DLL_PUBLIC inline int stride(){ return cairo_image_surface_get_stride(surface()); }
-    DLL_PUBLIC inline int nBytes(){ return getHeight() * stride(); }
+    DLL_PUBLIC inline std::size_t nBytes(){
+      return static_cast<std::size_t>(getHeight()) * stride();
+    }
 
     DLL_PUBLIC inline int getWidth() { return backend()->getWidth(); }
     DLL_PUBLIC inline int getHeight() { return backend()->getHeight(); }