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.

Sign up for GitHub

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

fix compilation when imagemagick is v7 #12493

Closed
wants to merge 34 commits into from
Closed

fix compilation when imagemagick is v7 #12493

Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
84d1559
fix compilation when imagemagick is v7
Izopi4a Dec 22, 2016
296bc5f
try if tests will pass
Izopi4a Dec 22, 2016
85f7bd1
tests
Izopi4a Dec 22, 2016
50f72f7
tests 2
Izopi4a Dec 22, 2016
4e83234
imagick on crappy windows
Izopi4a Dec 22, 2016
8a93680
Merge branch 'imagemagick-7-support' of https://github.com/Izopi4a/cp…
Izopi4a Dec 22, 2016
c93ac84
test
Izopi4a Dec 22, 2016
8e8d80d
test
Izopi4a Dec 22, 2016
f1e1e77
t
Izopi4a Dec 22, 2016
44c0a24
t2
Izopi4a Dec 22, 2016
a5d47e1
t2
Izopi4a Dec 22, 2016
a3ecc7e
t3
Izopi4a Dec 22, 2016
7580fc0
t
Izopi4a Dec 22, 2016
d91994c
p
Izopi4a Dec 22, 2016
44eb181
p
Izopi4a Dec 22, 2016
27c65f8
p
Izopi4a Dec 22, 2016
5f238b6
p
Izopi4a Dec 22, 2016
17ae39a
p
Izopi4a Dec 22, 2016
e2e43c0
p
Izopi4a Dec 22, 2016
2863137
p
Izopi4a Dec 22, 2016
2947891
p
Izopi4a Dec 22, 2016
a25a0bd
p
Izopi4a Dec 22, 2016
2116e82
p
Izopi4a Dec 22, 2016
02b20ec
p
Izopi4a Dec 22, 2016
bfcf217
sss
Izopi4a Dec 23, 2016
e971112
g
Izopi4a Dec 23, 2016
92a4ed8
g
Izopi4a Dec 23, 2016
fd200dc
dfsg
Izopi4a Dec 23, 2016
45e659d
h
Izopi4a Dec 23, 2016
531714c
jkl
Izopi4a Dec 23, 2016
820aa9c
dg
Izopi4a Dec 23, 2016
8a71c3c
b
Izopi4a Dec 23, 2016
996c951
hh
Izopi4a Dec 23, 2016
543e23f
u
Izopi4a Dec 23, 2016
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
15 changes: 12 additions & 3 deletions phalcon/image/adapter/imagick.zep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,13 +352,22 @@ class Imagick extends Adapter
*/
protected function _watermark(<Adapter> image, int offsetX, int offsetY, int opacity)
{
var watermark, ret;
var watermark, ret, imagickVersion, method;

let opacity = opacity / 100,
watermark = new \Imagick();
watermark = new \Imagick(),
imagickVersion = \Imagick::getVersion();

preg_match("/ImageMagick ([0-9]+\.[0-9]+\.[0-9]+)/", imagickVersion["versionString"], imagickVersion);

if version_compare(imagickVersion[1], '7') < 0 {
Copy link
Contributor

@sergeyklay sergeyklay Dec 22, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'7' -> "7"

let method = "setImageOpacity";
} else {
let method = "setImageAlpha";
}

watermark->readImageBlob(image->render());
watermark->setImageOpacity(opacity);
watermark->{method}(opacity);

this->_image->setIteratorIndex(0);

Expand Down