Merge pull request #16 from citywill/patch-2

Update png.js

Merge pull request #16 from citywill/patch-2
Update png.js
e6b61326 · Bo Zhang · GitHub · 89c16d02 · fcc99c9a · e6b61326
Commit e6b61326 authored Oct 21, 2016 by Bo Zhang Committed by GitHub Oct 21, 2016
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

png.js src/protocol/png.js +5 -5

No files found.
--- a/src/protocol/png.js
+++ b/src/protocol/png.js
@@ -136,10 +136,10 @@ define(function(require, exports, module) {
        /* 获取 SVG 文件内容 */
        var svgInfo = getSVGInfo(minder);
-        var width = option.width && option.width > svgInfo.width ? option.width : svgInfo.width;
+        var width = option && option.width && option.width > svgInfo.width ? option.width : svgInfo.width;
-        var height = option.height && option.height > svgInfo.height ? option.height : svgInfo.height;
+        var height = option && option.height && option.height > svgInfo.height ? option.height : svgInfo.height;
-        var offsetX = option.width && option.width > svgInfo.width ? (option.width - svgInfo.width)/2 : 0;
+        var offsetX = option && option.width && option.width > svgInfo.width ? (option.width - svgInfo.width)/2 : 0;
-        var offsetY = option.height && option.height > svgInfo.height ? (option.height - svgInfo.height)/2 : 0;
+        var offsetY = option && option.height && option.height > svgInfo.height ? (option.height - svgInfo.height)/2 : 0;
        var svgDataUrl = svgInfo.dataUrl;
        var imagesInfo = svgInfo.imagesInfo;