smartyellow/docx-js
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge with upstream master

Browse Source
This commit is contained in:
Sergio Mendonça
2018-08-14 11:27:08 -03:00
parent 36157bb8db 7b43551148
commit f91fd5921f
42 changed files with 486 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/file/media/media.ts
View File

@ -4,8 +4,9 @@ import * as path from "path";
import { File } from "../file";
import { IDrawingOptions } from "../drawing";
import { Image } from "../paragraph";
import { ImageParagraph } from "../paragraph";
import { IMediaData } from "./data";
import { Image } from "./image";
interface IHackedFile {
currentRelationshipId: number;
@ -21,7 +22,7 @@ export class Media {
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
`media/${mediaData.fileName}`,
);
return new Image(mediaData, drawingOptions);
return new Image(new ImageParagraph(mediaData, drawingOptions));
}
public static addImageFromBuffer(file: File, buffer: Buffer, width?: number, height?: number, drawingOptions?: IDrawingOptions): Image {
@ -40,7 +41,7 @@ export class Media {
`media/${mediaData.fileName}`,
);
return new Image(mediaData, drawingOptions);
return new Image(new ImageParagraph(mediaData, drawingOptions));
}
private static generateId(): string {
@ -106,12 +107,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),
},
},
};