Watermarking with Image done. Repeating/Tile feature working.

Author: ajaxray

README.md

@@ -1,6 +1,14 @@
 # PHPWatermark
 
-Add Watermark on images using PHP and [ImageMagick](http://www.imagemagick.org) 
+Add Watermark on images using PHP and [ImageMagick](http://www.imagemagick.org)
+
+### Pre-requisite
+ 
+ - PHP (version 5.6 or higher)
+ - [ImageMagick](http://www.imagemagick.org)
+ 
+ 
+ 
 ---
 
 > "This is the Book about which there is no doubt, a guidance for those conscious of Allah" - [Al-Quran](http://quran.com)

examples/example.php

@@ -13,4 +13,16 @@
 
 $text = "ajaxray.com";
 $watermark->withText($text, __DIR__ . '/img/result_simple.jpg');
-echo $watermark->buildTextMarkCommand($text, __DIR__ . 'img/result_simple.jpg');
+// echo $watermark->buildTextMarkCommand($text, __DIR__ . 'img/result_simple.jpg');
+
+$watermark->setTiled()->setTileSize(200, 150);
+$watermark->setFontSize(24);
+$watermark->withText($text, __DIR__ . '/img/result_tiled.jpg');
+// echo $watermark->buildTextMarkCommand($text, __DIR__ . 'img/result_tiled.jpg'). PHP_EOL;
+
+// Watermarking with image
+$imgMark = new Watermark(__DIR__ . '/img/mountain.jpg');
+$imgMark->setPosition(Watermark::POSITION_TOP_RIGHT);
+$imgMark->setOffset(50, 50);
+$imgMark->setOpacity(.3);
+$imgMark->withImage(__DIR__ . '/img/php.png', __DIR__ . '/img/result_logo.jpg');

examples/img/logo.png

@@ -9,7 +9,7 @@
 namespace Ajaxray\PHPWatermark;
 
 // https://www.sitepoint.com/adding-text-watermarks-with-imagick/
-// https://www.sitepoint.com/watermarking-images/
+// http://www.imagemagick.org/Usage/annotating/#watermarking
 
 class Watermark
 {
@@ -26,14 +26,17 @@ class Watermark
 
 
     // @TODO : Option to change style
-    const PRINT_STYLE_DARK = 1;
-    const PRINT_STYLE_LIGHT = 2;
-    const PRINT_STYLE_BEVEL = 3;
+    const IMG_STYLE_COLORLESS = 1;
+    const IMG_STYLE_DISSOLVE = 2;
+    const TEXT_STYLE_DARK = 1;
+    const TEXT_STYLE_LIGHT = 2;
+    const TEXT_STYLE_BEVEL = 3;
 
     private $position = 'Center';
-    private $offsetX = 5;
-    private $offsetY = 5;
+    private $offsetX = 0;
+    private $offsetY = 0;
     private $tiled = false;
+    private $tileSize = ['100', '100'];
 
     /**
      * Font name. Should be one of the list displayed by `convert -list font` command
@@ -44,7 +47,6 @@ class Watermark
     private $fontSize = 12;
     private $opacity = 0.4;
     private $rotate = 0;
-    private $style = self::PRINT_STYLE_BEVEL;
     private $source;
 
     /**
@@ -58,19 +60,32 @@ public function __construct($source)
         return $this;
     }
 
-    public function withText($text, $destination)
+    public function withText($text, $writeTo = null)
     {
+        $destination = $writeTo ?: $this->source;
         $this->ensureExists($this->source);
-        $this->ensureWritable(dirname($destination));
+        $this->ensureWritable(($writeTo ? dirname($destination) : $destination));
 
         exec($this->buildTextMarkCommand($text, $destination), $output, $returnCode);
         return (empty($output) && $returnCode == 0);
     }
 
+    public function withImage($marker, $writeTo = null)
+    {
+        $destination = $writeTo ?: $this->source;
+        $this->ensureExists($this->source);
+        $this->ensureExists($marker);
+        $this->ensureWritable(($writeTo ? dirname($destination) : $destination));
+
+        exec($this->buildImageMarkCommand($marker, $destination), $output, $returnCode);
+        return (empty($output) && $returnCode == 0);
+    }
+
     public function buildTextMarkCommand($text, $destination)
     {
-        $text = escapeshellarg($text);
+        $source = $this->getSource();
         $destination = escapeshellarg($destination);
+        $text = escapeshellarg($text);
 
         $anchor = 'gravity '. $this->getPosition();
         $rotate = ($this->getRotate() == '0')? '' : "rotate {$this->getRotate()}";
@@ -83,16 +98,38 @@ public function buildTextMarkCommand($text, $destination)
         $offsetLight = "{$offset[0]},{$offset[1]}";
         $offsetDark = ($offset[0] + 1) .','. ($offset[1] + 1);
 
+        $draw = " -draw \"$rotate $anchor $colorLight text $offsetLight $text $colorDark text $offsetDark $text \" ";
+
+        // @TODO : Fix issue with single quote
         if($this->isTiled()) {
-            $command = "convert -size 140x80 xc:none  $font -$colorLight -$anchor -draw \"$rotate text 10,10 $text\"  miff:- ";
-            $command .= " | composite -tile - {$this->source}  $destination";
+            $size = "-size ". implode('x', $this->getTileSize());
+            $command = "convert $size xc:none  $font -$anchor $draw miff:- ";
+            $command .= " | composite -tile - $source  $destination";
         } else {
-            $command = "convert {$this->getSource()}  $font -draw \"$rotate $anchor $colorLight text $offsetLight $text $colorDark text $offsetDark $text\" $destination";
+            $command = "convert $source $font $draw $destination";
         }
 
         return $command;
     }
 
+    public function buildImageMarkCommand($marker, $destination)
+    {
+        $source = $this->getSource();
+        $destination = escapeshellarg($destination);
+        $marker = escapeshellarg($marker);
+
+        $anchor = 'gravity '. $this->getPosition();
+        $rotate = ($this->getRotate() == '0')? '' : "rotate {$this->getRotate()}";
+
+        $offsetArr = $this->getOffset();
+        $offset = "geometry +{$offsetArr[0]}+{$offsetArr[1]}";
+        $tile = $this->isTiled() ? '-tile' : '';
+        //$opacity = 'dissolve '. ($this->getOpacity() * 100) .'%';
+        $opacity = 'watermark '. ($this->getOpacity() * 100);
+
+        // @TODO : Gap/offset between image tiles
+        return "composite -$anchor -$offset -$rotate -$opacity $tile $marker $source $destination";
+    }
 
     private function ensureExists($filePath)
     {
@@ -106,7 +143,7 @@ private function ensureExists($filePath)
     private function ensureWritable($dirPath)
     {
         if (! is_writable($dirPath)) {
-            $message = "The specified destination directory $dirPath is not writable!";
+            $message = "The specified destination $dirPath is not writable!";
             throw new \RuntimeException($message);
             // @TODO : Create DestNotWritableException
         }
@@ -192,6 +229,27 @@ public function setTiled($tiled = true)
         return $this;
     }
 
+    /**
+     * @param $width
+     * @param $height
+     *
+     * @return Watermark
+     */
+    public function setTileSize($width, $height)
+    {
+        $this->tileSize = [intval($width), intval($height)];
+
+        return $this;
+    }
+
+    /**
+     * @return array
+     */
+    public function getTileSize()
+    {
+        return $this->tileSize;
+    }
+
     /**
      * @return string
      */