cvs: pear /Image_Text/Image Text.php

ssttoo Sat May 19 02:54:19 2007 UTC

Modified files:
/pear/Image_Text/Image Text.php
Log:
Fixed bug #11066- using image as canvas option was being ignored

http://cvs.php.net/viewvc.cgi/pear/I...&diff_format=u
Index: pear/Image_Text/Image/Text.php
diff -u pear/Image_Text/Image/Text.php:1.33 pear/Image_Text/Image/Text.php:1.34
--- pear/Image_Text/Image/Text.php:1.33 Tue Apr 24 03:38:16 2007
+++ pear/Image_Text/Image/Text.php Sat May 19 02:54:19 2007
@@ -72,7 +72,7 @@
* @author Tobias Schlitt <toby@php.net>
* @copyright 1997-2005 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version CVS: $Id: Text.php,v 1.33 2007/04/24 03:38:16 ssttoo Exp $
+ * @version CVS: $Id: Text.php,v 1.34 2007/05/19 02:54:19 ssttoo Exp $
* @link http://pear.php.net/package/Net_FTP2
* @since File available since Release 0.0.1
*/
@@ -580,7 +580,7 @@
}

// Check and create canvas
-
+ $image_canvas = false;
switch (true) {
case (empty($this->options['canvas'])):

@@ -595,6 +595,7 @@
case (is_resource($this->options['canvas']) &&
get_resource_type($this->options['canvas'])=='gd'):
// The canvas is an image resource
+ $image_canvas = true;
$this->_img = $this->options['canvas'];
break;

@@ -649,12 +650,14 @@
}
$colBg = imagecolorallocatealpha($this->_img, $arBg['r'], $arBg['g'], $arBg['b'], $arBg['a']);
}
- imagefilledrectangle(
- $this->_img,
- 0, 0,
- $this->options['canvas']['width'] - 1, $this->options['canvas']['height'] - 1,
- $colBg
- );
+ if ($image_canvas === false) {
+ imagefilledrectangle(
+ $this->_img,
+ 0, 0,
+ $this->options['canvas']['width'] - 1, $this->options['canvas']['height'] - 1,
+ $colBg
+ );
+ }


// Save and repair angle