|
1 | 1 | /*
|
2 |
| - * JavaScript Load Image 1.1.4 |
| 2 | + * JavaScript Load Image 1.1.5 |
3 | 3 | * https://github.com/blueimp/JavaScript-Load-Image
|
4 | 4 | *
|
5 | 5 | * Copyright 2011, Sebastian Tschan
|
|
56 | 56 | loadImage.scale = function (img, options) {
|
57 | 57 | options = options || {};
|
58 | 58 | var canvas = document.createElement('canvas'),
|
| 59 | + width = img.width, |
| 60 | + height = img.height, |
59 | 61 | scale = Math.max(
|
60 |
| - (options.minWidth || img.width) / img.width, |
61 |
| - (options.minHeight || img.height) / img.height |
| 62 | + (options.minWidth || width) / width, |
| 63 | + (options.minHeight || height) / height |
62 | 64 | );
|
63 | 65 | if (scale > 1) {
|
64 |
| - img.width = parseInt(img.width * scale, 10); |
65 |
| - img.height = parseInt(img.height * scale, 10); |
| 66 | + width = parseInt(width * scale, 10); |
| 67 | + height = parseInt(height * scale, 10); |
66 | 68 | }
|
67 | 69 | scale = Math.min(
|
68 |
| - (options.maxWidth || img.width) / img.width, |
69 |
| - (options.maxHeight || img.height) / img.height |
| 70 | + (options.maxWidth || width) / width, |
| 71 | + (options.maxHeight || height) / height |
70 | 72 | );
|
71 | 73 | if (scale < 1) {
|
72 |
| - img.width = parseInt(img.width * scale, 10); |
73 |
| - img.height = parseInt(img.height * scale, 10); |
| 74 | + width = parseInt(width * scale, 10); |
| 75 | + height = parseInt(height * scale, 10); |
74 | 76 | }
|
75 | 77 | if (!options.canvas || !canvas.getContext) {
|
| 78 | + img.width = width; |
| 79 | + img.height = height; |
76 | 80 | return img;
|
77 | 81 | }
|
78 |
| - canvas.width = img.width; |
79 |
| - canvas.height = img.height; |
| 82 | + canvas.width = width; |
| 83 | + canvas.height = height; |
80 | 84 | canvas.getContext('2d')
|
81 |
| - .drawImage(img, 0, 0, img.width, img.height); |
| 85 | + .drawImage(img, 0, 0, width, height); |
82 | 86 | return canvas;
|
83 | 87 | };
|
84 | 88 |
|
|
0 commit comments