Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

- fixed setting of fillColor at different places (using element 'line'

  instead of 'fill'
  Closes bug #12084


git-svn-id: https://svn.php.net/repository/pear/packages/Image_Canvas/trunk@262260 c90b9560-bf6c-de11-be94-00142212c4b1
  • Loading branch information...
commit 7168c09ea9e0b618c45a7187c642454f9b9c2bcf 1 parent 11452d0
Uwe Steinmann authored
Showing with 12 additions and 12 deletions.
  1. +4 −4 Canvas/PDF.php
  2. +4 −4 Canvas/PS.php
  3. +4 −4 Canvas/SVG.php
View
8 Canvas/PDF.php
@@ -560,7 +560,7 @@ function line($params)
function polygon($params = array())
{
$connectEnds = (isset($params['connect']) ? $params['connect'] : false);
- $fillColor = (isset($params['fill']) ? $params['line'] : false);
+ $fillColor = (isset($params['fill']) ? $params['fill'] : false);
$lineColor = (isset($params['line']) ? $params['line'] : false);
$line = $this->_setLineStyle($lineColor);
@@ -640,7 +640,7 @@ function rectangle($params)
$y0 = $this->_getY($params['y0']);
$x1 = $this->_getX($params['x1']);
$y1 = $this->_getY($params['y1']);
- $fillColor = (isset($params['fill']) ? $params['line'] : false);
+ $fillColor = (isset($params['fill']) ? $params['fill'] : false);
$lineColor = (isset($params['line']) ? $params['line'] : false);
$line = $this->_setLineStyle($lineColor);
@@ -676,7 +676,7 @@ function ellipse($params)
$y = $params['y'];
$rx = $params['rx'];
$ry = $params['ry'];
- $fillColor = (isset($params['fill']) ? $params['line'] : false);
+ $fillColor = (isset($params['fill']) ? $params['fill'] : false);
$lineColor = (isset($params['line']) ? $params['line'] : false);
$line = $this->_setLineStyle($lineColor);
@@ -745,7 +745,7 @@ function pieslice($params)
$v2 = $this->_getY($params['v2']);
$srx = $this->_getX($params['srx']);
$sry = $this->_getY($params['sry']);
- $fillColor = (isset($params['fill']) ? $params['line'] : false);
+ $fillColor = (isset($params['fill']) ? $params['fill'] : false);
$lineColor = (isset($params['line']) ? $params['line'] : false);
// TODO Implement PDFLIB::pieSlice()
View
8 Canvas/PS.php
@@ -553,7 +553,7 @@ function line($params)
function polygon($params = array())
{
$connectEnds = (isset($params['connect']) ? $params['connect'] : false);
- $fillColor = (isset($params['fill']) ? $params['line'] : false);
+ $fillColor = (isset($params['fill']) ? $params['fill'] : false);
$lineColor = (isset($params['line']) ? $params['line'] : false);
$line = $this->_setLineStyle($lineColor);
@@ -633,7 +633,7 @@ function rectangle($params)
$y0 = $this->_getY($params['y0']);
$x1 = $this->_getX($params['x1']);
$y1 = $this->_getY($params['y1']);
- $fillColor = (isset($params['fill']) ? $params['line'] : false);
+ $fillColor = (isset($params['fill']) ? $params['fill'] : false);
$lineColor = (isset($params['line']) ? $params['line'] : false);
$line = $this->_setLineStyle($lineColor);
@@ -669,7 +669,7 @@ function ellipse($params)
$y = $params['y'];
$rx = $params['rx'];
$ry = $params['ry'];
- $fillColor = (isset($params['fill']) ? $params['line'] : false);
+ $fillColor = (isset($params['fill']) ? $params['fill'] : false);
$lineColor = (isset($params['line']) ? $params['line'] : false);
$line = $this->_setLineStyle($lineColor);
@@ -738,7 +738,7 @@ function pieslice($params)
$v2 = $this->_getY($params['v2']);
$srx = $this->_getX($params['srx']);
$sry = $this->_getY($params['sry']);
- $fillColor = (isset($params['fill']) ? $params['line'] : false);
+ $fillColor = (isset($params['fill']) ? $params['fill'] : false);
$lineColor = (isset($params['line']) ? $params['line'] : false);
// TODO Implement pslib::pieSlice()
View
8 Canvas/SVG.php
@@ -455,7 +455,7 @@ function line($params)
function polygon($params = array())
{
$connectEnds = (isset($params['connect']) ? $params['connect'] : false);
- $fillColor = (isset($params['fill']) ? $params['line'] : false);
+ $fillColor = (isset($params['fill']) ? $params['fill'] : false);
$lineColor = (isset($params['line']) ? $params['line'] : false);
if (!$connectEnds) {
@@ -528,7 +528,7 @@ function rectangle($params)
$y0 = min($this->_getY($params['y0']), $this->_getY($params['y1']));
$x1 = max($this->_getX($params['x0']), $this->_getX($params['x1']));
$y1 = max($this->_getY($params['y0']), $this->_getY($params['y1']));
- $fillColor = (isset($params['fill']) ? $params['line'] : false);
+ $fillColor = (isset($params['fill']) ? $params['fill'] : false);
$lineColor = (isset($params['line']) ? $params['line'] : false);
$attrs = (isset($params['attrs']) && is_array($params['attrs'])) ? $this->_getAttributes($params['attrs']) : null;
@@ -568,7 +568,7 @@ function ellipse($params)
$y = $this->_getY($params['y']);
$rx = $this->_getX($params['rx']);
$ry = $this->_getY($params['ry']);
- $fillColor = (isset($params['fill']) ? $params['line'] : false);
+ $fillColor = (isset($params['fill']) ? $params['fill'] : false);
$lineColor = (isset($params['line']) ? $params['line'] : false);
$attrs = (isset($params['attrs']) && is_array($params['attrs'])) ? $this->_getAttributes($params['attrs']) : null;
@@ -616,7 +616,7 @@ function pieslice($params)
$v2 = $this->_getY($params['v2']);
$srx = (isset($params['srx']) ? $this->_getX($params['srx']) : false);
$sry = (isset($params['sry']) ? $this->_getX($params['sry']) : false);
- $fillColor = (isset($params['fill']) ? $params['line'] : false);
+ $fillColor = (isset($params['fill']) ? $params['fill'] : false);
$lineColor = (isset($params['line']) ? $params['line'] : false);
$attrs = (isset($params['attrs']) && is_array($params['attrs'])) ? $this->_getAttributes($params['attrs']) : null;
Please sign in to comment.
Something went wrong with that request. Please try again.