Skip to content

Commit d1ef8b0

Browse files
authored
Merge pull request #807 from mlocati/imagick-win-wrong-load-logic
Fix wrong load logic in Imagick
2 parents 9c09484 + 6fac590 commit d1ef8b0

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

src/Imagick/Imagine.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@ public function open($path)
6666
if ($loader->isLocalFile()) {
6767
if (DIRECTORY_SEPARATOR === '\\' && PHP_INT_SIZE === 8 && defined('PHP_VERSION_ID') && PHP_VERSION_ID >= 70100 && PHP_VERSION_ID < 70200) {
6868
// Passing the file name to the Imagick constructor may break PHP 7.1 64 bit on Windows - see https://github.com/mkoppanen/imagick/issues/252
69-
$imagick = new \Imagick($loader->getPath());
70-
} else {
7169
$imagick = new \Imagick();
7270
$imagick->readImageBlob($loader->getData(), $path);
71+
} else {
72+
$imagick = new \Imagick($path);
7373
}
7474
} else {
7575
$imagick = new \Imagick();

tests/tests/Image/AbstractLayersTest.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,6 @@ public function testLayerArrayAccessOutOfBoundsExceptions($offset)
182182
$layers[$offset] = $secondImage;
183183
}
184184

185-
/**
186-
* @doesNotPerformAssertions
187-
*/
188185
public function testAnimateEmpty()
189186
{
190187
try {
@@ -209,7 +206,6 @@ public function testAnimateEmpty()
209206

210207
/**
211208
* @dataProvider provideAnimationParameters
212-
* @doesNotPerformAssertions
213209
*
214210
* @param mixed $delay
215211
* @param mixed $loops

0 commit comments

Comments
 (0)