@@ -55,7 +55,7 @@ |
||
| 55 | 55 | */ |
| 56 | 56 | public function set_opacity($opacity) |
| 57 | 57 | { |
| 58 | - if (!is_numeric($opacity) || ($opacity < 0) || ( $opacity > 1)) { |
|
| 58 | + if (!is_numeric($opacity) || ($opacity < 0) || ($opacity > 1)) { |
|
| 59 | 59 | throw new InvalidArgumentException( |
| 60 | 60 | 'Opacity must be a float between 0.0 and 1.0' |
| 61 | 61 | ); |
@@ -36,7 +36,7 @@ |
||
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | $gravity = $this->image()->imagemagick_gravity($this->gravity()); |
| 39 | - $cmd = '-gravity '.$gravity.' '; |
|
| 39 | + $cmd = '-gravity '.$gravity.' '; |
|
| 40 | 40 | $cmd .= '-geometry +'.$this->x().'+'.$this->y().' '; |
| 41 | 41 | $cmd .= '-draw "image Multiply 0,0 '.$width.','.$height.' '; |
| 42 | 42 | $cmd .= '\''.$watermark.'\'"'; |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | { |
| 13 | 13 | /** |
| 14 | 14 | * @param array $data The effect data, if available. |
| 15 | - * @return ImagickWatermarkEffect Chainable |
|
| 15 | + * @return ImagemagickWatermarkEffect Chainable |
|
| 16 | 16 | */ |
| 17 | 17 | public function process(array $data = null) |
| 18 | 18 | { |
@@ -280,8 +280,8 @@ |
||
| 280 | 280 | $proc = proc_open( |
| 281 | 281 | $cmd, |
| 282 | 282 | [ |
| 283 | - 1 => ['pipe','w'], |
|
| 284 | - 2 => ['pipe','w'], |
|
| 283 | + 1 => ['pipe', 'w'], |
|
| 284 | + 2 => ['pipe', 'w'], |
|
| 285 | 285 | ], |
| 286 | 286 | $pipes |
| 287 | 287 | ); |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | * @param integer $height Image height, in pixels. |
| 69 | 69 | * @param string $color Default to transparent. |
| 70 | 70 | * @throws InvalidArgumentException If the size arguments are not valid. |
| 71 | - * @return Image Chainable |
|
| 71 | + * @return ImagemagickImage Chainable |
|
| 72 | 72 | */ |
| 73 | 73 | public function create($width, $height, $color = 'rgb(100%, 100%, 100%, 0)') |
| 74 | 74 | { |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | * @param string $source The source path / filename. |
| 96 | 96 | * @throws Exception If the source file does not exist. |
| 97 | 97 | * @throws InvalidArgumentException If the source argument is not a string. |
| 98 | - * @return Image Chainable |
|
| 98 | + * @return ImagemagickImage Chainable |
|
| 99 | 99 | */ |
| 100 | 100 | public function open($source = null) |
| 101 | 101 | { |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | * @param string $target The target path / filename. |
| 124 | 124 | * @throws Exception If the target file does not exist or is not writeable. |
| 125 | 125 | * @throws InvalidArgumentException If the target argument is not a string. |
| 126 | - * @return Image Chainable |
|
| 126 | + * @return ImagemagickImage Chainable |
|
| 127 | 127 | */ |
| 128 | 128 | public function save($target = null) |
| 129 | 129 | { |
@@ -339,7 +339,7 @@ discard block |
||
| 339 | 339 | * |
| 340 | 340 | * @param string $gravity The standard gravity name. |
| 341 | 341 | * @throws InvalidArgumentException If the gravity argument is not a valid gravity. |
| 342 | - * @return integer |
|
| 342 | + * @return string |
|
| 343 | 343 | */ |
| 344 | 344 | public function imagemagickGravity($gravity) |
| 345 | 345 | { |
@@ -18,7 +18,7 @@ |
||
| 18 | 18 | |
| 19 | 19 | $max = $this->image()->imagick()->getQuantumRange(); |
| 20 | 20 | $max = $max["quantumRangeLong"]; |
| 21 | - $threshold = ($this->threshold() * $max); |
|
| 21 | + $threshold = ($this->threshold()*$max); |
|
| 22 | 22 | $this->image()->imagick()->thresholdImage($threshold); |
| 23 | 23 | |
| 24 | 24 | return $this; |
@@ -11,7 +11,7 @@ |
||
| 11 | 11 | { |
| 12 | 12 | /** |
| 13 | 13 | * @param array $data The effect data, if available. |
| 14 | - * @return ImagickSepiaEffect Chainable |
|
| 14 | + * @return ImagickThresholdEffect Chainable |
|
| 15 | 15 | */ |
| 16 | 16 | public function process(array $data = null) |
| 17 | 17 | { |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | if (isset($data['source']) && $data['source'] !== null) { |
| 58 | 58 | $this->set_source($data['source']); |
| 59 | 59 | } |
| 60 | - if (isset($data['target']) && $data['target'] !==null) { |
|
| 60 | + if (isset($data['target']) && $data['target'] !== null) { |
|
| 61 | 61 | $this->set_target($data['target']); |
| 62 | 62 | } |
| 63 | 63 | if (isset($data['effects']) && $data['effects'] !== null) { |
@@ -232,7 +232,7 @@ discard block |
||
| 232 | 232 | throw new Exception('Ratio can not be calculated. Invalid image dimensions'); |
| 233 | 233 | } |
| 234 | 234 | |
| 235 | - $ratio = ($width / $height); |
|
| 235 | + $ratio = ($width/$height); |
|
| 236 | 236 | return $ratio; |
| 237 | 237 | } |
| 238 | 238 | |
@@ -11,7 +11,7 @@ |
||
| 11 | 11 | { |
| 12 | 12 | /** |
| 13 | 13 | * @param array $data The effect data, if available. |
| 14 | - * @return ImagickMirrorEffect Chainable |
|
| 14 | + * @return ImagemagickMirrorEffect Chainable |
|
| 15 | 15 | */ |
| 16 | 16 | public function process(array $data = null) |
| 17 | 17 | { |
@@ -11,7 +11,7 @@ |
||
| 11 | 11 | { |
| 12 | 12 | /** |
| 13 | 13 | * @param array $data The effect data, if available. |
| 14 | - * @return ImagickRevertEffect Chainable |
|
| 14 | + * @return ImagemagickRevertEffect Chainable |
|
| 15 | 15 | */ |
| 16 | 16 | public function process(array $data = null) |
| 17 | 17 | { |
@@ -11,7 +11,7 @@ |
||
| 11 | 11 | { |
| 12 | 12 | /** |
| 13 | 13 | * @param array $data The effect data, if available. |
| 14 | - * @return ImagickRotateEffect Chainable |
|
| 14 | + * @return ImagemagickRotateEffect Chainable |
|
| 15 | 15 | */ |
| 16 | 16 | public function process(array $data = null) |
| 17 | 17 | { |
@@ -11,7 +11,7 @@ |
||
| 11 | 11 | { |
| 12 | 12 | /** |
| 13 | 13 | * @param array $data The effect data, if available. |
| 14 | - * @return ImagickSepiaEffect Chainable |
|
| 14 | + * @return ImagemagickSepiaEffect Chainable |
|
| 15 | 15 | */ |
| 16 | 16 | public function process(array $data = null) |
| 17 | 17 | { |