composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

PDF export : Exporting objects with AttributeImage value to default was crashing due to a "division by zero". Fixed.

Browse Source 
SVN:trunk[4267]
This commit is contained in:
Guillaume Lajarige
2016-06-29 14:05:24 +00:00
parent 3a25916f00
commit 970f75d5e2
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/pdfbulkexport.class.inc.php
View File

@@ -204,23 +204,28 @@ EOF
{
// To limit the image size in the PDF output, we have to enforce the size as height/width because max-width/max-height have no effect
//
list($iWidth, $iHeight) = utils::GetImageSize($value->GetData());
$iMaxWidthPx = min(48, $oAttDef->Get('display_max_width'));
$iMaxHeightPx = min(48, $oAttDef->Get('display_max_height'));
$fScale = min($iMaxWidthPx / $iWidth, $iMaxHeightPx / $iHeight);
$iNewWidth = $iWidth * $fScale;
$iNewHeight = $iHeight * $fScale;
$iDefaultMaxWidthPx = 48;
$iDefaultMaxHeightPx = 48;
if ($value->IsEmpty())
{
$iNewWidth = $iDefaultMaxWidthPx;
$iNewHeight = $iDefaultMaxHeightPx;
$sUrl = $oAttDef->Get('default_image');
$sRet = '<img src="'.$sUrl.'" style="width: '.$iNewWidth.'px; height: '.$iNewHeight.'px">';
}
else
{
$sUrl = 'data:'.$value->GetMimeType().';base64,'.base64_encode($value->GetData());
$sRet = '<img src="'.$sUrl.'" style="width: '.$iNewWidth.'px; height: '.$iNewHeight.'px">';
list($iWidth, $iHeight) = utils::GetImageSize($value->GetData());
$iMaxWidthPx = min($iDefaultMaxWidthPx, $oAttDef->Get('display_max_width'));
$iMaxHeightPx = min($iDefaultMaxHeightPx, $oAttDef->Get('display_max_height'));
$fScale = min($iMaxWidthPx / $iWidth, $iMaxHeightPx / $iHeight);
$iNewWidth = $iWidth * $fScale;
$iNewHeight = $iHeight * $fScale;
$sUrl = 'data:' . $value->GetMimeType() . ';base64,' . base64_encode($value->GetData());
}
$sRet = '<img src="' . $sUrl . '" style="width: ' . $iNewWidth . 'px; height: ' . $iNewHeight . 'px">';
$sRet = '<div class="view-image">'.$sRet.'</div>';
}
else