Merge branch 'master' into feat/footnotes

# Conflicts:
#	demo/demo16.js
#	src/file/file.ts
This commit is contained in:
Dolan
2018-06-27 23:34:23 +01:00
76 changed files with 1552 additions and 251 deletions

View File

@ -1,18 +1,19 @@
import { Drawing } from "../../drawing";
import { IDrawingOptions } from "../../drawing/drawing";
import { IMediaData } from "../../media/data";
import { Run } from "../run";
export class PictureRun extends Run {
private drawing: Drawing;
constructor(imageData: IMediaData) {
constructor(imageData: IMediaData, drawingOptions?: IDrawingOptions) {
super();
if (imageData === undefined) {
throw new Error("imageData cannot be undefined");
}
this.drawing = new Drawing(imageData);
this.drawing = new Drawing(imageData, drawingOptions);
this.root.push(this.drawing);
}