SVG logo image can not show bug fixed.

ushelp · Aug 13, 2021 · 3a645bf · 3a645bf
1 parent b53cdfe
commit 3a645bf
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/dist/easy.qrcode.min.js b/dist/easy.qrcode.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "easyqrcodejs",
-	"version": "4.4.3",
+	"version": "4.4.4",
 	"description": "Cross-browser QRCode generator for pure javascript. Support Canvas, SVG and Table drawing methods. Support Dot style, Logo, Background image, Colorful, Title etc. settings. Support Angular, Vue.js, React, Next.js, Svelte framework. Support binary(hex) data mode.(Running with DOM on client side)",
 	"main": "dist/easy.qrcode.min.js",
 	"scripts": {},

diff --git a/src/canvas2svg.js b/src/canvas2svg.js
@@ -1148,7 +1148,8 @@
             }
             svgImage.setAttribute("transform", translateDirective);
             svgImage.setAttributeNS("http://www.w3.org/1999/xlink", "xlink:href",
-                image.nodeName === "CANVAS" ? image.toDataURL() : image.getAttribute("src"));
+                // image.nodeName === "CANVAS" ? image.toDataURL() : image.getAttribute("src"));
+                image.nodeName === "CANVAS" ? image.toDataURL() : image.originalSrc);
             parent.appendChild(svgImage);
         }
     };

diff --git a/src/easy.qrcode.js b/src/easy.qrcode.js
@@ -3,7 +3,7 @@
  * 
  * Cross-browser QRCode generator for pure javascript. Support Canvas, SVG and Table drawing methods. Support Dot style, Logo, Background image, Colorful, Title etc. settings. Support Angular, Vue.js, React, Next.js, Svelte framework. Support binary(hex) data mode.(Running with DOM on client side)
  * 
- * Version 4.4.3
+ * Version 4.4.4
  * 
  * @author [ inthinkcolor@gmail.com ]
  * 
@@ -1513,6 +1513,7 @@
                 if (_htOption.crossOrigin != null) {
                     bgImg.crossOrigin = _htOption.crossOrigin;
                 }
+                bgImg.originalSrc = _htOption.backgroundImage;
                 bgImg.src = _htOption.backgroundImage;
                 // DoSomething
             } else {
@@ -1796,9 +1797,9 @@
                     if (_htOption.crossOrigin != null) {
                         img.crossOrigin = _htOption.crossOrigin;
                     }
+                    img.originalSrc = _htOption.logo;
                     img.src = _htOption.logo;
 
-
                 } else {
                     drawQuietZoneColor();
                     this._bIsPainted = true;