diff --git a/examples/trim.php b/examples/trim.php new file mode 100644 index 0000000..e84a87c --- /dev/null +++ b/examples/trim.php @@ -0,0 +1,31 @@ + + * Copyright (c) 2009, Ian Selby/Gen X Design + * + * Author(s): Ian Selby + * + * Licensed under the MIT License + * Redistributions of files must retain the above copyright notice. + * + * @author Oleg Sherbakov + * @copyright Copyright (c) 2016 + * @license http://www.opensource.org/licenses/mit-license.php The MIT License + * @version 3.0 + * @package PhpThumb + * @subpackage Examples + * @filesource + */ + +require_once '../vendor/autoload.php'; + +$thumb = new PHPThumb\GD(__DIR__ .'/../tests/resources/test.jpg', array(), array( + new PHPThumb\Plugins\Trim(array(255, 255, 255), 'TBLR') +)); + +$thumb->show(); diff --git a/examples/watermark.php b/examples/watermark.php new file mode 100644 index 0000000..5b8358e --- /dev/null +++ b/examples/watermark.php @@ -0,0 +1,33 @@ + + * Copyright (c) 2009, Ian Selby/Gen X Design + * + * Author(s): Ian Selby + * + * Licensed under the MIT License + * Redistributions of files must retain the above copyright notice. + * + * @author Oleg Sherbakov + * @copyright Copyright (c) 2016 + * @license http://www.opensource.org/licenses/mit-license.php The MIT License + * @version 3.0 + * @package PhpThumb + * @subpackage Examples + * @filesource + */ + +require_once '../vendor/autoload.php'; + +$watermark = new PHPThumb\GD(__DIR__ .'/../tests/resources/test.jpg'); + +$thumb = new PHPThumb\GD(__DIR__ .'/../tests/resources/test.jpg', array(), array( + new PHPThumb\Plugins\Watermark($watermark->resizePercent(20), 'center', 50, 0, 0) +)); + +$thumb->show(); diff --git a/src/PHPThumb/GD.php b/src/PHPThumb/GD.php index 350bf19..6b6eeaa 100644 --- a/src/PHPThumb/GD.php +++ b/src/PHPThumb/GD.php @@ -762,9 +762,10 @@ public function rotateImage($direction = 'CW') * Rotates image specified number of degrees * * @param int $degrees + * @param array $fillColor * @return \PHPThumb\GD */ - public function rotateImageNDegrees($degrees) + public function rotateImageNDegrees($degrees, $fillColor = array(0, 0, 0)) { if (!is_numeric($degrees)) { throw new \InvalidArgumentException('$degrees must be numeric'); @@ -774,13 +775,20 @@ public function rotateImageNDegrees($degrees) throw new \RuntimeException('Your version of GD does not support image rotation'); } - $this->workingImage = imagerotate($this->oldImage, $degrees, 0); + $this->workingImage = imagerotate( + $this->oldImage, + $degrees, + imagecolorallocate( + $this->oldImage, + $fillColor[0], + $fillColor[1], + $fillColor[2] + ) + ); - $newWidth = $this->currentDimensions['height']; - $newHeight = $this->currentDimensions['width']; $this->oldImage = $this->workingImage; - $this->currentDimensions['width'] = $newWidth; - $this->currentDimensions['height'] = $newHeight; + $this->currentDimensions['width'] = imagesx($this->workingImage); + $this->currentDimensions['height'] = imagesy($this->workingImage); return $this; } diff --git a/src/PHPThumb/Plugins/Trim.php b/src/PHPThumb/Plugins/Trim.php new file mode 100644 index 0000000..e4c63cb --- /dev/null +++ b/src/PHPThumb/Plugins/Trim.php @@ -0,0 +1,221 @@ + + * Copyright (c) 2009, Ian Selby/Gen X Design + * + * Author(s): Ian Selby + * + * Licensed under the MIT License + * Redistributions of files must retain the above copyright notice. + * + * @author Oleg Sherbakov + * @copyright Copyright (c) 2016 + * @license http://www.opensource.org/licenses/mit-license.php The MIT License + * @version 1.0 + * @package PhpThumb + * @filesource + */ + +/** + * GD Trim Lib Plugin + * + * This plugin allows you to trim unnecessary single color borders from any side of image + * + * @package PhpThumb + * @subpackage Plugins + */ +class Trim implements \PHPThumb\PluginInterface +{ + /** + * @var array Contains trimmed color in array of RGB parts + */ + protected $color; + + /** + * @var array Contains array of sides which will be trim + */ + protected $sides; + + /** + * Validate whether RGB color parts array valid or not + * + * @param $colors + * @return bool + */ + private function validateColor($colors) + { + if (!(is_array($colors) && count($colors) == 3)) + return false; + + foreach($colors as $color) { + if ($color < 0 || $color > 255) + return false; + } + + return true; + } + + /** + * Validates whether sides is valid or not + * + * @param $sidesString + * @return bool + */ + private function validateSides($sidesString) + { + $sides = str_split($sidesString); + + if (count($sides) > 4 || count($sides) == 0) + return false; + + foreach($sides as $side) { + if (!in_array($side, array('T', 'B', 'L', 'R'))) + return false; + } + + return true; + } + + /** + * Trim constructor + * + * @param array $color + * @param string $sides + */ + public function __construct($color = array(255, 255, 255), $sides = 'TBLR') + { + // make sure our arguments are valid + if (!$this->validateColor($color)) { + throw new \InvalidArgumentException('Color must be array of RGB color model parts'); + } + + if (!$this->validateSides($sides)) { + throw new \InvalidArgumentException('Sides must be string with T, B, L, and/or R coordinates'); + } + + $this->color = $color; + $this->sides = str_split($sides); + } + + /** + * Converts rgb parts array to integer representation + * + * @param array $rgb + * @return number + */ + private function rgb2int(array $rgb) + { + return hexdec( + sprintf("%02x%02x%02x", $rgb[0], $rgb[1], $rgb[2]) + ); + } + + /** + * @param \PHPThumb\GD $phpthumb + * @return \PHPThumb\GD + */ + public function execute($phpthumb) + { + $currentImage = $phpthumb->getOldImage(); + $currentDimensions = $phpthumb->getCurrentDimensions(); + + $borderTop = 0; + $borderBottom = 0; + $borderLeft = 0; + $borderRight = 0; + + if (in_array('T', $this->sides)) { + for (; $borderTop < $currentDimensions['height']; ++$borderTop) { + for ($x = 0; $x < $currentDimensions['width']; ++$x) { + if (imagecolorat( + $currentImage, + $x, + $borderTop + ) != $this->rgb2int($this->color)) { + break 2; + } + } + } + } + + if (in_array('B', $this->sides)) { + for (; $borderBottom < $currentDimensions['height']; ++$borderBottom) { + for ($x = 0; $x < $currentDimensions['width']; ++$x) { + if (imagecolorat( + $currentImage, + $x, + $currentDimensions['height'] - $borderBottom - 1 + ) != $this->rgb2int($this->color)) { + break 2; + } + } + } + } + + if (in_array('L', $this->sides)) { + for (; $borderLeft < $currentDimensions['width']; ++$borderLeft) { + for ($y = 0; $y < $currentDimensions['height']; ++$y) { + if (imagecolorat( + $currentImage, + $borderLeft, + $y + ) != $this->rgb2int($this->color)) { + break 2; + } + } + } + } + + if (in_array('R', $this->sides)) { + for (; $borderRight < $currentDimensions['width']; ++$borderRight) { + for ($y = 0; $y < $currentDimensions['height']; ++$y) { + if (imagecolorat( + $currentImage, + $currentDimensions['width'] - $borderRight - 1, + $y + ) != $this->rgb2int($this->color)) { + break 2; + } + } + } + } + + $newWidth = $currentDimensions['width'] - ($borderLeft + $borderRight); + $newHeight = $currentDimensions['height'] - ($borderTop + $borderBottom); + + $newImage = imagecreatetruecolor( + $newWidth, + $newHeight + ); + + imagecopy( + $newImage, + $currentImage, + 0, + 0, + $borderLeft, + $borderTop, + $currentDimensions['width'], + $currentDimensions['height'] + ); + + $phpthumb->setOldImage($newImage); + + $phpthumb->setCurrentDimensions(array( + 'width' => $newWidth, + 'height' => $newHeight + )); + + return $phpthumb; + } +} + + diff --git a/src/PHPThumb/Plugins/Watermark.php b/src/PHPThumb/Plugins/Watermark.php new file mode 100644 index 0000000..06605c9 --- /dev/null +++ b/src/PHPThumb/Plugins/Watermark.php @@ -0,0 +1,115 @@ + + * Copyright (c) 2009, Ian Selby/Gen X Design + * + * Author(s): Ian Selby + * + * Licensed under the MIT License + * Redistributions of files must retain the above copyright notice. + * + * @author Oleg Sherbakov + * @copyright Copyright (c) 2016 + * @license http://www.opensource.org/licenses/mit-license.php The MIT License + * @version 1.0 + * @package PhpThumb + * @filesource + */ + +/** + * GD Watermark Lib Plugin + * + * This plugin allows you to add watermark above the image + * + * @package PhpThumb + * @subpackage Plugins + */ +class Watermark implements \PHPThumb\PluginInterface +{ + protected $wm; + protected $position; + protected $opacity; + protected $offsetX; + protected $offsetY; + + /** + * Watermark constructor. + * + * @param \PHPThumb\GD $wm Watermark image as \PHPThumb\GD instance + * @param string $position Can be: left/west, right/east, center for the x-axis and top/north/upper, bottom/lower/south, center for the y-axis + * @param int $opacity Opacity of the watermark in percent, 0 = total transparent, 100 = total opaque + * @param int $offsetX Offset on the x-axis. can be negative to set an offset to the left + * @param int $offsetY Offset on the y-axis. can be negative to set an offset to the top + */ + public function __construct(\PHPThumb\GD $wm, $position = 'center', $opacity = 100, $offsetX = 0, $offsetY = 0) + { + $this->wm = $wm; + $this->position = $position; + $this->opacity = $opacity; + $this->offsetX = $offsetX; + $this->offsetY = $offsetY; + } + + /** + * @param \PHPThumb\GD $phpthumb + * @return \PHPThumb\GD + */ + public function execute($phpthumb) + { + $currentDimensions = $phpthumb->getCurrentDimensions(); + $watermarkDimensions = $this->wm->getCurrentDimensions(); + + $watermarkPositionX = $this->offsetX; + $watermarkPositionY = $this->offsetY; + + if (preg_match('/right|east/i', $this->position)) { + $watermarkPositionX += $currentDimensions['width'] - $watermarkDimensions['width']; + } else if (!preg_match('/left|west/i', $this->position)) { + $watermarkPositionX += intval($currentDimensions['width']/2 - $watermarkDimensions['width']/2); + } + + if (preg_match('/bottom|lower|south/i', $this->position)) { + $watermarkPositionY += $currentDimensions['height'] - $watermarkDimensions['height']; + } else if (!preg_match('/upper|top|north/i', $this->position)) { + $watermarkPositionY += intval($currentDimensions['height']/2 - $watermarkDimensions['height']/2); + } + + $workingImage = $phpthumb->getWorkingImage(); + $watermarkImage = ($this->wm->getWorkingImage() ? $this->wm->getWorkingImage() : $this->wm->getOldImage()); + + $this->imageCopyMergeAlpha( + $workingImage, + $watermarkImage, + $watermarkPositionX, + $watermarkPositionY, + 0, + 0, + $watermarkDimensions['width'], + $watermarkDimensions['height'], + $this->opacity + ); + + $phpthumb->setWorkingImage($workingImage); + + return $phpthumb; + } + + /** + * Function copied from: http://www.php.net/manual/en/function.imagecopymerge.php#92787 + * Does the same as "imagecopymerge" but preserves the alpha-channel + */ + private function imageCopyMergeAlpha(&$dst_im, &$src_im, $dst_x, $dst_y, $src_x, $src_y, $src_w, $src_h, $pct){ + $cut = imagecreatetruecolor($src_w, $src_h); + imagecopy($cut, $dst_im, 0, 0, $dst_x, $dst_y, $src_w, $src_h); + imagecopy($cut, $src_im, 0, 0, $src_x, $src_y, $src_w, $src_h); + imagecopymerge($dst_im, $cut, $dst_x, $dst_y, $src_x, $src_y, $src_w, $src_h, $pct); + } +}