From c49466ae715f04916e27365fa08839967fddc634 Mon Sep 17 00:00:00 2001 From: Paul Irish Date: Fri, 12 May 2017 20:04:36 -0700 Subject: [PATCH 1/2] demo: keep image aspect ratio --- test/browser_test.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/browser_test.html b/test/browser_test.html index 0c6b52a..65069b7 100644 --- a/test/browser_test.html +++ b/test/browser_test.html @@ -69,6 +69,7 @@ display: block; border: 1px solid rgba(0, 0, 0, .12); margin-bottom: 20px; + width: 100%; } .clear { @@ -173,10 +174,10 @@

Image SSIM var img = new Image(); img.onload = function () { var canvas = document.createElement('canvas'); - canvas.width = width; - canvas.height = height; + canvas.width = img.width; + canvas.height = img.height; var ctx = canvas.getContext('2d'); - ctx.drawImage(img, 0, 0, width, canvas.height); + ctx.drawImage(img, 0, 0, canvas.width, canvas.height); var id = ctx.getImageData(0, 0, canvas.width, canvas.height); done({width: canvas.width, height: canvas.height, data: id.data, channels: 4, canvas: canvas}, index); }; From b732b75e5dba2e2ba5d4329640f948bbc5ca8649 Mon Sep 17 00:00:00 2001 From: Paul Irish Date: Fri, 12 May 2017 20:06:26 -0700 Subject: [PATCH 2/2] alert any exceptions (incl non-matching sizes) --- test/browser_test.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/browser_test.html b/test/browser_test.html index 65069b7..0593bfb 100644 --- a/test/browser_test.html +++ b/test/browser_test.html @@ -215,7 +215,12 @@

Image SSIM log.windowSize = pair[2]; log.luminance = pair[3]; var start = new Date().getTime(); - var res = ImageSSIM.compare(images[0], images[1], pair[2], 0.01, 0.03, pair[3]) + var res; + try { + res = ImageSSIM.compare(images[0], images[1], pair[2], 0.01, 0.03, pair[3]) + } catch (e) { + alert(e); + } log.ssim = Math.round(res.ssim * 1000) / 1000; // log.mcs = Math.round(res.mcs * 1000) / 1000; log.ellapsed = new Date().getTime() - start + 'ms';