From 86e99899bc1ea467faede556da7a8d4322cb75e0 Mon Sep 17 00:00:00 2001
From: Andrea Bogazzi <andreabogazzi79@gmail.com>
Date: Mon, 5 Sep 2016 20:18:50 +0200
Subject: [PATCH] Update image.class.js

---
 src/shapes/image.class.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/shapes/image.class.js b/src/shapes/image.class.js
index ed71706e..f046c52f 100644
--- a/src/shapes/image.class.js
+++ b/src/shapes/image.class.js
@@ -395,6 +395,9 @@
       canvasEl.getContext('2d').drawImage(imgElement, 0, 0, imgElement.width, imgElement.height);
 
       filters.forEach(function(filter) {
+        if (!filter) {
+          return;
+        }
         if (forResizing) {
           scaleX = _this.scaleX < minimumScale ? _this.scaleX : 1;
           scaleY = _this.scaleY < minimumScale ? _this.scaleY : 1;
@@ -409,8 +412,8 @@
           scaleX = filter.scaleX;
           scaleY = filter.scaleY;
         }
-        filter && filter.applyTo(canvasEl, scaleX, scaleY);
-        if (!forResizing && filter && filter.type === 'Resize') {
+        filter.applyTo(canvasEl, scaleX, scaleY);
+        if (!forResizing && filter.type === 'Resize') {
           _this.width *= filter.scaleX;
           _this.height *= filter.scaleY;
         }
@@ -422,7 +425,8 @@
       if (fabric.isLikelyNode) {
         replacement.src = canvasEl.toBuffer(undefined, fabric.Image.pngCompression);
         // onload doesn't fire in some node versions, so we invoke callback manually
-        _this._element = replacement;      //   !forResizing && (_this._filteredEl = replacement);
+        _this._element = replacement;
+        !forResizing && (_this._filteredEl = replacement);
         callback && callback(_this);
       }
       else {