ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3729 from FinnStutzenstein/pdfImageSize

Browse Source 
Fixed parsing of image sizes
This commit is contained in:
Emanuel Schütze 2018-05-02 13:53:34 +02:00 committed by GitHub
commit b37bad72ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
openslides/core/static/js/core/pdf.js
View File

@ -948,43 +948,37 @@ angular.module('OpenSlidesApp.core.pdf', [])
alreadyConverted.push(pObjectToPush);
break;
case "img":
var regex = /([\w-]*)\s*:\s*([^;]*)/g;
var match; //helper variable for the regex
var imageSize={};
var maxResolution = {
width: 435,
height: 830
};
var path = element.getAttribute('src');
var height = images[path].height;
var width = images[path].width;
var maxWidth = 450;
var scale = 100;
if (element.getAttribute("style")) {
while ((match = regex.exec(element.getAttribute("style"))) !== null) {
imageSize[match[1]] = parseInt(match[2].trim());
var style = element.getAttribute('style');
if (style) {
var match = style.match(/width:\s*(\d+)\%/);
if (match) {
scale = parseInt(match[1]);
}
} else {
imageSize = {
height: images[element.getAttribute("src")].height,
width: images[element.getAttribute("src")].width
};
}
if (imageSize.width > maxResolution.width) {
var scaleByWidth = maxResolution.width/imageSize.width;
imageSize.width *= scaleByWidth;
imageSize.height *= scaleByWidth;
// scale image
width = (width * scale) / 100;
height = (height * scale) / 100;
if (width > maxWidth) {
height = (height * maxWidth) / width;
width = maxWidth;
}
if (imageSize.height > maxResolution.height) {
var scaleByHeight = maxResolution.height/imageSize.height;
imageSize.width *= scaleByHeight;
imageSize.height *= scaleByHeight;
}
var path = element.getAttribute("src");
// remove trailing / for the virtual file system (there is no root)
if (path.indexOf('/') === 0) {
path = path.substr(1); // remove trailing /
path = path.substr(1);
}
alreadyConverted.push({
image: path,
width: imageSize.width,
height: imageSize.height
width: width,
height: height,
});
break;
case "ul":