Merge pull request #5388 from plotly/switch-to-probe-image-size

Use probe-image-size module to read width and height of images

Author: archmoj

package-lock.json

@@ -97,7 +97,6 @@
     "glslify": "^7.1.1",
     "has-hover": "^1.0.1",
     "has-passive-events": "^1.0.0",
-    "image-size": "^0.7.5",
     "is-mobile": "^2.2.2",
     "mapbox-gl": "1.10.1",
     "matrix-camera-controller": "^2.1.3",
@@ -109,6 +108,7 @@
     "ndarray-linear-interpolate": "^1.0.0",
     "parse-svg-path": "^0.1.2",
     "polybooljs": "^1.2.0",
+    "probe-image-size": "^6.0.0",
     "regl": "^1.6.1",
     "regl-error2d": "^2.0.11",
     "regl-line2d": "^3.1.0",

package.json

@@ -8,12 +8,12 @@
 
 'use strict';
 
-var sizeOf = require('image-size');
+var probeSync = require('probe-image-size/sync');
 var dataUri = require('../../snapshot/helpers').IMAGE_URL_PREFIX;
 var Buffer = require('buffer/').Buffer;  // note: the trailing slash is important!
 
 exports.getImageSize = function(src) {
     var data = src.replace(dataUri, '');
     var buff = new Buffer(data, 'base64');
-    return sizeOf(buff);
+    return probeSync(buff);
 };

src/traces/image/helpers.js

@@ -1,5 +1,5 @@
 var fs = require('fs');
-var sizeOf = require('image-size');
+var probeSync = require('probe-image-size/sync');
 
 var getMockList = require('./assets/get_mock_list');
 var getRequestOpts = require('./assets/get_image_request_options');
@@ -121,7 +121,7 @@ function testExport(mockName, format, cb) {
         var didExport;
 
         if(format === 'svg') {
-            var dims = sizeOf(imagePaths.test);
+            var dims = probeSync(fs.readFileSync(imagePaths.test));
             didExport = (dims.width === WIDTH) && (dims.height === HEIGHT);
         } else {
             var stats = fs.statSync(imagePaths.test);