Merge pull request #3264 from emanuelschuetze/issue3263

Changed PdfImageConverter to ImageConverter (Fixed #3263).
This commit is contained in:
Emanuel Schütze 2017-05-21 22:35:10 +02:00 committed by GitHub
commit ed0b1cef54

View File

@ -377,9 +377,9 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf'])
'gettextCatalog', 'gettextCatalog',
'PDFLayout', 'PDFLayout',
'PdfMakeConverter', 'PdfMakeConverter',
'PdfImageConverter', 'ImageConverter',
'HTMLValidizer', 'HTMLValidizer',
function ($q, gettextCatalog, PDFLayout, PdfMakeConverter, PdfImageConverter, HTMLValidizer) { function ($q, gettextCatalog, PDFLayout, PdfMakeConverter, ImageConverter, HTMLValidizer) {
/* /*
* content should be an array of content blocks. Each content is an object providing a * content should be an array of content blocks. Each content is an object providing a
* heading and a text. E.g. * heading and a text. E.g.
@ -518,7 +518,7 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf'])
}; };
return $q(function (resolve) { return $q(function (resolve) {
PdfImageConverter.toBase64(getImageSources()).then(function (imageMap) { ImageConverter.toBase64(getImageSources()).then(function (imageMap) {
converter = PdfMakeConverter.createInstance(imageMap); converter = PdfMakeConverter.createInstance(imageMap);
resolve({ resolve({
getContent: getContent, getContent: getContent,