Skip to content

Commit

Permalink
Merge pull request #11483 from phalcon/image/adapter/imagick_doc
Browse files Browse the repository at this point in the history
Cleaned Imagick doc
  • Loading branch information
sergeyklay committed Mar 4, 2016
2 parents 985f861 + b794eaf commit 230691f
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions phalcon/image/adapter/imagick.zep
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
+------------------------------------------------------------------------+
| Phalcon Framework |
+------------------------------------------------------------------------+
| Copyright (c) 2011-2015 Phalcon Team (http://www.phalconphp.com) |
| Copyright (c) 2011-2016 Phalcon Team (http://www.phalconphp.com) |
+------------------------------------------------------------------------+
| This source file is subject to the New BSD License that is bundled |
| with this package in the file docs/LICENSE.txt. |
Expand Down Expand Up @@ -511,8 +511,6 @@ class Imagick extends Adapter implements AdapterInterface

/**
* Composite one image onto another
*
* @param Adapter $mask mask Image instance
*/
protected function _mask(<Adapter> image)
{
Expand Down Expand Up @@ -700,8 +698,8 @@ class Imagick extends Adapter implements AdapterInterface

/**
* Sets the limit for a particular resource in megabytes
* @param int type Refer to the list of resourcetype constants (@see http://php.net/manual/ru/imagick.constants.php#imagick.constants.resourcetypes.)
* @param int limit The resource limit. The unit depends on the type of the resource being limited.
*
* @link http://php.net/manual/ru/imagick.constants.php#imagick.constants.resourcetypes
*/
public function setResourceLimit(int type, int limit)
{
Expand Down

0 comments on commit 230691f

Please sign in to comment.