Merge pull request #21 from darrynten/dev

Bugfixes
darrynten · Mar 20, 2017 · 56f2899 · 56f2899
2 parents e08c1dd + 53220c8
commit 56f2899
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 21 deletions.
diff --git a/src/Layers/BaseLayer.php b/src/Layers/BaseLayer.php
@@ -70,7 +70,7 @@ abstract class BaseLayer implements LayerInterface
  *
  * @var $composite
  */
- public $composite = Imagick::COMPOSITE_DEFAULT;
+ public $composite = Imagick::COMPOSITE_OVER;
 
  /**
  * Layer Filters
@@ -131,7 +131,7 @@ public function __construct(array $config)
 
  $this->canvas = new Imagick();
  $this->canvas->newImage($this->width, $this->height, new ImagickPixel('none'));
- $this->canvas->setImageFormat('png');
+ $this->canvas->setImageFormat('png32');
  }
 
  /**
@@ -262,13 +262,6 @@ public function render()
  }
  }
 
- /**
- * ImageMagick 7 has setImageAlpha, prior has setImageOpacity
- *
- * This check should ensure some compatibility
- */
- method_exists($this->canvas, 'setImageAlpha') ? $this->canvas->setImageAlpha($this->opacity()) : $this->canvas->setImageOpacity($this->opacity());
-
  return $this->canvas;
  }
 }
diff --git a/src/Layers/Layer/GradientLayer.php b/src/Layers/Layer/GradientLayer.php
@@ -53,7 +53,8 @@ public function __construct(array $config)
  !empty($config['endColour']) ? $config['endColour'] : '#000'
  );
 
- $this->canvas->newPseudoImage($config['width'], $config['height'], sprintf('gradient:%s-%s', $config['startColour'], $config['endColour']));
+ $this->canvas->setImageFormat('png32');
+ $this->canvas->newPseudoImage($config['width'], $config['height'], sprintf('gradient: %s-%s', $config['startColour'], $config['endColour']));
  }
 
  /**

diff --git a/src/Pslayers.php b/src/Pslayers.php
@@ -22,7 +22,7 @@ class Pslayers
  *
  * @var \Imagick $masterCanvas
  */
- private $masterCanvas;
+ public $masterCanvas;
 
  /**
  * Hold the config option
@@ -59,8 +59,8 @@ public function __construct(array $config)
  $this->config = new Config($config);
  $this->layers = new LayerCollection();
  $this->masterCanvas = new \Imagick();
- $this->masterCanvas->newImage($config['width'], $config['height'], new \ImagickPixel('rgba(255, 255, 255, 0)'));
- $this->masterCanvas->setImageFormat('png');
+ $this->masterCanvas->newImage($config['width'], $config['height'], new \ImagickPixel('none'));
+ $this->masterCanvas->setImageFormat('png32');
  }
 
  /**

diff --git a/src/Validators/ColourValidator.php b/src/Validators/ColourValidator.php
@@ -54,7 +54,7 @@ class ColourValidator
  *
  * @var array $validLongHex
  */
- private static $validWord = '/^none$/';
+ private static $validWord = '/^none|transparent$/';
 
  /**
  * Check if valid colour

diff --git a/tests/Pslayers/PslayersTest.php b/tests/Pslayers/PslayersTest.php
@@ -92,7 +92,7 @@ public function testMasterRender()
  'positionX' => 0,
  'positionY' => 0,
  'composite' => Imagick::COMPOSITE_DEFAULT,
- 'colour' => '#AF8',
+ 'colour' => '#0F0',
  ]);
 
  $instance->addLayer($backgroundLayer, 0);
@@ -101,13 +101,13 @@ public function testMasterRender()
  $gradientLayer = new GradientLayer([
  'id' => 'master-layer-gradient',
  'width' => $width,
- 'height' => $height,
- 'opacity' => 1.0,
+ 'height' => $height / 2,
+ 'opacity' => 0.9,
  'positionX' => 0,
  'positionY' => 0,
- 'composite' => Imagick::COMPOSITE_DIFFERENCE,
- 'startColour' => '#ED1021',
- 'endColour' => '#FFF',
+ 'composite' => Imagick::COMPOSITE_OVER,
+ 'startColour' => '#F00',
+ 'endColour' => 'transparent',
  ]);
 
  $instance->addLayer($gradientLayer, 1);
@@ -247,7 +247,7 @@ public function testMasterRender()
  ],
  ]);
 
- $instance->addLayer($imageLayer, 4);
+ // $instance->addLayer($imageLayer, 4);
 
  $instance->render();
  }