From 7c7ad1bf9d0e155db847c29a8c7c7245dd776f81 Mon Sep 17 00:00:00 2001 From: "CORP\\phedor" Date: Mon, 5 Mar 2018 16:24:41 +0300 Subject: [PATCH] =?UTF-8?q?=D0=93=D0=B5=D0=BD=D0=B5=D1=80=D0=B0=D1=86?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=B8=D0=B7=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Tools/TemplateImage.php | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/Tools/TemplateImage.php b/src/Tools/TemplateImage.php index 31bdfcc..6ce9a33 100644 --- a/src/Tools/TemplateImage.php +++ b/src/Tools/TemplateImage.php @@ -122,28 +122,26 @@ class Tools_TemplateImage $text = strtr($text, $this->context); $size = $value->fontSize; - fb('font-style'); - fb($value->fontStyle); $fontfile = $this->getFontFile($value->fontFamily . $this->fontSuffix($value->fontStyle)); $color = intval(substr($value->color, 1), 16); if ($value->align[0]) { - $align = Drawing::ALIGN_LEFT; + $align = Tools_Drawing::ALIGN_LEFT; } elseif ($value->align[2]) { - $align = Drawing::ALIGN_RIGHT; + $align = Tools_Drawing::ALIGN_RIGHT; } else { - $align = Drawing::ALIGN_CENTER; + $align = Tools_Drawing::ALIGN_CENTER; } if ($value->valign[0]) { $valign = Drawing::ALIGN_TOP; } elseif ($value->valign[1]) { - $valign = Drawing::ALIGN_CENTER; + $valign = Tools_Drawing::ALIGN_CENTER; } 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, $align, $valign); } @@ -154,7 +152,7 @@ class Tools_TemplateImage function encode($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)