Merge from master

This commit is contained in:
Dolan
2018-08-21 20:59:20 +01:00
24 changed files with 389 additions and 52 deletions

View File

@ -86,12 +86,12 @@ export class Media {
fileName: key,
dimensions: {
pixels: {
x: dimensions.width,
y: dimensions.height,
x: Math.round(dimensions.width),
y: Math.round(dimensions.height),
},
emus: {
x: dimensions.width * 9525,
y: dimensions.height * 9525,
x: Math.round(dimensions.width * 9525),
y: Math.round(dimensions.height * 9525),
},
},
};