libs/phplibrary
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of http://gitlab.edu.yar.ru/composer/PHP_Library

Browse source
This commit is contained in:
CORP\phedor 2018-03-15 14:49:19 +03:00
commit 77fa3dbd5e
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/Tools/TemplateImage.php
View file

@ -122,28 +122,26 @@ class Tools_TemplateImage
$text = strtr($text, $this->context); $text = strtr($text, $this->context);
$size = $value->fontSize; $size = $value->fontSize;
fb('font-style');
fb($value->fontStyle);
$fontfile = $this->getFontFile($value->fontFamily . $this->fontSuffix($value->fontStyle)); $fontfile = $this->getFontFile($value->fontFamily . $this->fontSuffix($value->fontStyle));
$color = intval(substr($value->color, 1), 16); $color = intval(substr($value->color, 1), 16);
if ($value->align[0]) { if ($value->align[0]) {
$align = Drawing::ALIGN_LEFT; $align = Tools_Drawing::ALIGN_LEFT;
} elseif ($value->align[2]) { } elseif ($value->align[2]) {
$align = Drawing::ALIGN_RIGHT; $align = Tools_Drawing::ALIGN_RIGHT;
} else { } else {
$align = Drawing::ALIGN_CENTER; $align = Tools_Drawing::ALIGN_CENTER;
} }
if ($value->valign[0]) { if ($value->valign[0]) {
$valign = Drawing::ALIGN_TOP; $valign = Drawing::ALIGN_TOP;
} elseif ($value->valign[1]) { } elseif ($value->valign[1]) {
$valign = Drawing::ALIGN_CENTER; $valign = Tools_Drawing::ALIGN_CENTER;
} else { } else {
$valign = Drawing::ALIGN_BOTTOM; $valign = Tools_Drawing::ALIGN_BOTTOM;
} }
Drawing::imagettftextbox($this->image, $size, 0, $value->left, $value->top, $color, $fontfile, $text, Tools_Drawing::imagettftextbox($this->image, $size, 0, $value->left, $value->top, $color, $fontfile, $text,
$value->width, $value->height, $value->width, $value->height,
$align, $valign); $align, $valign);
} }
@ -154,7 +152,7 @@ class Tools_TemplateImage
function encode($text) function encode($text)
{ {
assert(is_string($text)); assert(is_string($text));
return iconv("WINDOWS-1251", "UTF-8", $text); return $text; //iconv("WINDOWS-1251", "UTF-8", $text);
} }
function setSize($new_width, $new_height) function setSize($new_width, $new_height)