|
@@ -187,7 +187,7 @@ ImageLoader.prototype.combine = function (urls, canvas, config, onSuccess, onErr
|
|
|
for (let i = 0; i < config.length; i++) {
|
|
for (let i = 0; i < config.length; i++) {
|
|
|
let image = images[config[i].i - 1]
|
|
let image = images[config[i].i - 1]
|
|
|
//必须图片存在且正常加载配置才生效
|
|
//必须图片存在且正常加载配置才生效
|
|
|
- if (image.loaded === true) {
|
|
|
|
|
|
|
+ if (image && image.loaded === true) {
|
|
|
//计算最大宽度与合计高度
|
|
//计算最大宽度与合计高度
|
|
|
if (config[i].w <= 0) {
|
|
if (config[i].w <= 0) {
|
|
|
config[i].w = image.width
|
|
config[i].w = image.width
|
