remove all SVG image related functionality

I think this is going to have to come back in JS via canvg or
something. librsvg is too much of a pain (tons of dependencies) and
doesn't integrate with our fonts anyways.

Author: chearon

src/Image.cc

@@ -86,11 +86,6 @@ Image::Image(const Napi::CallbackInfo& info) : ObjectWrap<Image>(info), env(info
   width = height = 0;
   naturalWidth = naturalHeight = 0;
   state = DEFAULT;
-#ifdef HAVE_RSVG
-  _rsvg = NULL;
-  _is_svg = false;
-  _svg_last_width = _svg_last_height = 0;
-#endif
 }
 
 /*
@@ -210,13 +205,6 @@ Image::clearData() {
   free(filename);
   filename = NULL;
 
-#ifdef HAVE_RSVG
-  if (_rsvg != NULL) {
-    g_object_unref(_rsvg);
-    _rsvg = NULL;
-  }
-#endif
-
   width = height = 0;
   naturalWidth = naturalHeight = 0;
   state = DEFAULT;
@@ -310,18 +298,6 @@ Image::loadFromBuffer(uint8_t *buf, unsigned len) {
 #endif
   }
 
-  // confirm svg using first 1000 chars
-  // if a very long comment precedes the root <svg> tag, isSVG returns false
-  unsigned head_len = (len < 1000 ? len : 1000);
-  if (isSVG(buf, head_len)) {
-#ifdef HAVE_RSVG
-    return loadSVGFromBuffer(buf, len);
-#else
-    this->errorInfo.set("node-canvas was built without SVG support");
-    return CAIRO_STATUS_READ_ERROR;
-#endif
-  }
-
   if (isBMP(buf, len))
     return loadBMPFromBuffer(buf, len);
 
@@ -397,22 +373,6 @@ Image::loaded() {
  * Returns this image's surface.
  */
 cairo_surface_t *Image::surface() {
-#ifdef HAVE_RSVG
-  if (_is_svg && (_svg_last_width != width || _svg_last_height != height)) {
-    if (_surface != NULL) {
-      cairo_surface_destroy(_surface);
-      _surface = NULL;
-    }
-
-    cairo_status_t status = renderSVGToSurface();
-    if (status != CAIRO_STATUS_SUCCESS) {
-      g_object_unref(_rsvg);
-      Napi::Error::New(env, cairo_status_to_string(status)).ThrowAsJavaScriptException();
-
-      return NULL;
-    }
-  }
-#endif
   return _surface;
 }
 
@@ -462,31 +422,8 @@ Image::loadSurface() {
 #endif
   }
 
-  // confirm svg using first 1000 chars
-  // if a very long comment precedes the root <svg> tag, isSVG returns false
-  uint8_t head[1000] = {0};
-  fseek(stream, 0 , SEEK_END);
-  long len = ftell(stream);
-  unsigned head_len = (len < 1000 ? len : 1000);
-  unsigned head_size = head_len * sizeof(uint8_t);
-  rewind(stream);
-  if (head_size != fread(&head, 1, head_size, stream)) {
-    fclose(stream);
-    return CAIRO_STATUS_READ_ERROR;
-  }
-  rewind(stream);
-  if (isSVG(head, head_len)) {
-#ifdef HAVE_RSVG
-    return loadSVG(stream);
-#else
-    this->errorInfo.set("node-canvas was built without SVG support");
-    return CAIRO_STATUS_READ_ERROR;
-#endif
-  }
-
   if (isBMP(buf, 2))
     return loadBMP(stream);
-
   fclose(stream);
 
   this->errorInfo.set("Unsupported image type");
@@ -1460,115 +1397,6 @@ Image::rotatePixels(uint8_t* pixels, int width, int height, int channels,
 
 #endif /* HAVE_JPEG */
 
-#ifdef HAVE_RSVG
-
-/*
- * Load SVG from buffer
- */
-
-cairo_status_t
-Image::loadSVGFromBuffer(uint8_t *buf, unsigned len) {
-  _is_svg = true;
-
-  if (NULL == (_rsvg = rsvg_handle_new_from_data(buf, len, nullptr))) {
-    return CAIRO_STATUS_READ_ERROR;
-  }
-
-  double d_width;
-  double d_height;
-
-  rsvg_handle_get_intrinsic_size_in_pixels(_rsvg, &d_width, &d_height);
-
-  width = naturalWidth = d_width;
-  height = naturalHeight = d_height;
-
-  if (width <= 0 || height <= 0) {
-    this->errorInfo.set("Width and height must be set on the svg element");
-    return CAIRO_STATUS_READ_ERROR;
-  }
-
-  return renderSVGToSurface();
-}
-
-/*
- * Renders the Rsvg handle to this image's surface
- */
-cairo_status_t
-Image::renderSVGToSurface() {
-  cairo_status_t status;
-
-  _surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
-
-  status = cairo_surface_status(_surface);
-  if (status != CAIRO_STATUS_SUCCESS) {
-    g_object_unref(_rsvg);
-    return status;
-  }
-
-  cairo_t *cr = cairo_create(_surface);
-  status = cairo_status(cr);
-  if (status != CAIRO_STATUS_SUCCESS) {
-    g_object_unref(_rsvg);
-    return status;
-  }
-
-  RsvgRectangle viewport = {
-    0, // x
-    0, // y
-    static_cast<double>(width),
-    static_cast<double>(height)
-  };
-  gboolean render_ok = rsvg_handle_render_document(_rsvg, cr, &viewport, nullptr);
-  if (!render_ok) {
-    g_object_unref(_rsvg);
-    cairo_destroy(cr);
-    return CAIRO_STATUS_READ_ERROR; // or WRITE?
-  }
-
-  cairo_destroy(cr);
-
-  _svg_last_width = width;
-  _svg_last_height = height;
-
-  return status;
-}
-
-/*
- * Load SVG
- */
-
-cairo_status_t
-Image::loadSVG(FILE *stream) {
-  _is_svg = true;
-
-  struct stat s;
-  int fd = fileno(stream);
-
-  // stat
-  if (fstat(fd, &s) < 0) {
-    fclose(stream);
-    return CAIRO_STATUS_READ_ERROR;
-  }
-
-  uint8_t *buf = (uint8_t *) malloc(s.st_size);
-
-  if (!buf) {
-    fclose(stream);
-    return CAIRO_STATUS_NO_MEMORY;
-  }
-
-  size_t read = fread(buf, s.st_size, 1, stream);
-  fclose(stream);
-
-  cairo_status_t result = CAIRO_STATUS_READ_ERROR;
-  if (1 == read) result = loadSVGFromBuffer(buf, s.st_size);
-  free(buf);
-
-  return result;
-}
-
-#endif /* HAVE_RSVG */
-
 /*
  * Load BMP from buffer.
  */
@@ -1641,7 +1469,7 @@ cairo_status_t Image::loadBMP(FILE *stream){
 }
 
 /*
- * Return UNKNOWN, SVG, GIF, JPEG, or PNG based on the filename.
+ * Return UNKNOWN, GIF, JPEG, or PNG based on the filename.
  */
 
 Image::type
@@ -1652,7 +1480,6 @@ Image::extension(const char *filename) {
   if (len >= 4 && 0 == strcmp(".gif", filename - 4)) return Image::GIF;
   if (len >= 4 && 0 == strcmp(".jpg", filename - 4)) return Image::JPEG;
   if (len >= 4 && 0 == strcmp(".png", filename - 4)) return Image::PNG;
-  if (len >= 4 && 0 == strcmp(".svg", filename - 4)) return Image::SVG;
   return Image::UNKNOWN;
 }
 
@@ -1683,27 +1510,6 @@ Image::isPNG(uint8_t *data) {
   return 'P' == data[1] && 'N' == data[2] && 'G' == data[3];
 }
 
-/*
- * Skip "<?" and "<!" tags to test if root tag starts "<svg"
- */
-int
-Image::isSVG(uint8_t *data, unsigned len) {
-  for (unsigned i = 3; i < len; i++) {
-    if ('<' == data[i-3]) {
-      switch (data[i-2]) {
-        case '?':
-        case '!':
-          break;
-        case 's':
-          return ('v' == data[i-1] && 'g' == data[i]);
-        default:
-          return false;
-      }
-    }
-  }
-  return false;
-}
-
 /*
  * Check for valid BMP signatures
  */

src/Image.h

@@ -23,14 +23,6 @@
   #endif
 #endif
 
-#ifdef HAVE_RSVG
-#include <librsvg/rsvg.h>
-  // librsvg <= 2.36.1, identified by undefined macro, needs an extra include
-  #ifndef LIBRSVG_CHECK_VERSION
-  #include <librsvg/rsvg-cairo.h>
-  #endif
-#endif
-
 using JPEGDecodeL = std::function<uint32_t (uint8_t* const src)>;
 
 class Image : public Napi::ObjectWrap<Image> {
@@ -58,7 +50,6 @@ class Image : public Napi::ObjectWrap<Image> {
     static int isPNG(uint8_t *data);
     static int isJPEG(uint8_t *data);
     static int isGIF(uint8_t *data);
-    static int isSVG(uint8_t *data, unsigned len);
     static int isBMP(uint8_t *data, unsigned len);
     static cairo_status_t readPNG(void *closure, unsigned char *data, unsigned len);
     inline int isComplete(){ return COMPLETE == state; }
@@ -68,11 +59,6 @@ class Image : public Napi::ObjectWrap<Image> {
     cairo_status_t loadPNGFromBuffer(uint8_t *buf);
     cairo_status_t loadPNG();
     void clearData();
-#ifdef HAVE_RSVG
-    cairo_status_t loadSVGFromBuffer(uint8_t *buf, unsigned len);
-    cairo_status_t loadSVG(FILE *stream);
-    cairo_status_t renderSVGToSurface();
-#endif
 #ifdef HAVE_GIF
     cairo_status_t loadGIFFromBuffer(uint8_t *buf, unsigned len);
     cairo_status_t loadGIF(FILE *stream);
@@ -128,7 +114,6 @@ class Image : public Napi::ObjectWrap<Image> {
       , GIF
       , JPEG
       , PNG
-      , SVG
     } type;
 
     static type extension(const char *filename);
@@ -137,10 +122,4 @@ class Image : public Napi::ObjectWrap<Image> {
     cairo_surface_t *_surface;
     uint8_t *_data = nullptr;
     int _data_len;
-#ifdef HAVE_RSVG
-    RsvgHandle *_rsvg;
-    bool _is_svg;
-    int _svg_last_width;
-    int _svg_last_height;
-#endif
 };

src/init.cc

@@ -99,10 +99,6 @@ Napi::Object init(Napi::Env env, Napi::Object exports) {
 #endif
 #endif
 
-#ifdef HAVE_RSVG
-  exports.Set("rsvgVersion", Napi::String::New(env, LIBRSVG_VERSION));
-#endif
-
   char freetype_version[10];
   snprintf(freetype_version, 10, "%d.%d.%d", FREETYPE_MAJOR, FREETYPE_MINOR, FREETYPE_PATCH);
   exports.Set("freetypeVersion", Napi::String::New(env, freetype_version));

test/canvas.test.js

@@ -2387,20 +2387,4 @@ describe('Canvas', function () {
       assert.throws(() => { ctx.beginTag('Link', {}) })
     })
   })
-
-  describe('loadImage', function () {
-    it('doesn\'t crash when you don\'t specify width and height', async function () {
-      const err = {name: "Error"};
-
-      // TODO: remove this when we have a static build or something
-      if (os.platform() !== 'win32') {
-        err.message = "Width and height must be set on the svg element";
-      }
-
-      await assert.rejects(async () => {
-        const svg = `<svg xmlns="http://www.w3.org/2000/svg"><path d="M1,1"/></svg>`;
-        await loadImage(Buffer.from(svg));
-      }, err);
-    });
-  });
 })

test/image.test.js

@@ -11,7 +11,6 @@ const fs = require('fs')
 const path = require('path')
 
 const { createCanvas, loadImage, rsvgVersion, Image } = require('../')
-const HAVE_SVG = rsvgVersion !== undefined
 
 
 const pngCheckers = path.join(__dirname, '/fixtures/checkers.png')
@@ -121,32 +120,6 @@ describe('Image', function () {
     }, MyError)
   })
 
-  it('loads SVG data URL base64', function () {
-    if (!HAVE_SVG) this.skip()
-    const base64Enc = fs.readFileSync(svgTree, 'base64')
-    const dataURL = `data:image/svg+xml;base64,${base64Enc}`
-    return loadImage(dataURL).then((img) => {
-      assert.strictEqual(img.onerror, null)
-      assert.strictEqual(img.onload, null)
-      assert.strictEqual(img.width, 200)
-      assert.strictEqual(img.height, 200)
-      assert.strictEqual(img.complete, true)
-    })
-  })
-
-  it('loads SVG data URL utf8', function () {
-    if (!HAVE_SVG) this.skip()
-    const utf8Encoded = fs.readFileSync(svgTree, 'utf8')
-    const dataURL = `data:image/svg+xml;utf8,${utf8Encoded}`
-    return loadImage(dataURL).then((img) => {
-      assert.strictEqual(img.onerror, null)
-      assert.strictEqual(img.onload, null)
-      assert.strictEqual(img.width, 200)
-      assert.strictEqual(img.height, 200)
-      assert.strictEqual(img.complete, true)
-    })
-  })
-
   it('calls Image#onload multiple times', function () {
     return loadImage(pngClock).then((img) => {
       let onloadCalled = 0