Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
Olivier Laviale committed Jul 7, 2014
1 parent c27e2b5 commit cda4b8a
Showing 1 changed file with 30 additions and 25 deletions.
55 changes: 30 additions & 25 deletions lib/image.php
Expand Up @@ -540,7 +540,7 @@ static public function resize($source, &$t_w, &$t_h, $method, $fill_callback=nul
'purple' => array(0xffffff, 0xdcccf8)
);

static public function draw_grid($image, $x1, $y1, $x2, $y2, $color1=0xFFFFFF, $color2=0xCCCCCC, $size=8)
static public function draw_grid($image, $x1, $y1, $x2, $y2, $color1=0xFFFFFF, $color2=0xCCCCCC, $size=4)
{
#
# resolve size
Expand Down Expand Up @@ -633,30 +633,32 @@ static public function decode_color($color)

if (is_string($color))
{
if ($color{0} == '#')
if ($color[0] == '#')
{
$color = substr($color, 1);
}

switch (strlen($color))
{
case 3:

return array
(
intval($color{0} . $color{0}, 16),
intval($color{1} . $color{1}, 16),
intval($color{2} . $color{2}, 16)
);

case 6:

return array
(
intval($color{0} . $color{1}, 16),
intval($color{2} . $color{3}, 16),
intval($color{4} . $color{5}, 16)
);
switch (strlen($color))
{
case 4:
{
return array
(
intval($color[1] . $color[1], 16),
intval($color[2] . $color[2], 16),
intval($color[3] . $color[3], 16)
);
}
break;

case 7:
{
return array
(
intval($color[1] . $color[2], 16),
intval($color[3] . $color[4], 16),
intval($color[5] . $color[6], 16)
);
}
break;
}
}

// TODO-20090418: add support for rgb()
Expand All @@ -680,7 +682,10 @@ static public function allocate_color($image, $color)
{
$color = self::decode_color($color);

return imagecolorallocate($image, $color[0], $color[1], $color[2]);
return imagecolorallocate
(
$image, $color[0], $color[1], $color[2]
);
}

static public $color_names = array
Expand Down

0 comments on commit cda4b8a

Please sign in to comment.