Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleaned Imagick doc #11483

Merged
merged 1 commit into from
Mar 4, 2016
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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