cvs: pear /Image_GIS package.xml /Image_GIS/GIS Parser.php Renderer.php

sebastian Sun Sep 28 17:17:44 2003 EDT Modified files: /pear/Image_GIS package.xml /pear/Image_GIS/GIS Parser.php Renderer.php Log: PHP 5 compatibility fix. Bump version to 1.1.0-dev. Index: pear/Image_GIS/package.xml diff -u pear/Image_GIS/package.xml:1.10 pear/Image_GIS/package.xml:1.11 --- pear/Image_GIS/package.xml:1.10 Sat Jul 12 04:01:58 2003 +++ pear/Image_GIS/package.xml Sun Sep 28 17:17:40 2003 @@ -28,7 +28,7 @@ </maintainers> <license>PHP License</license> <release> - <version>1.0.1-dev</version> + <version>1.1.0-dev</version> <state>devel</state> <date>YYYY-MM-DD</date> <notes> @@ -46,6 +46,8 @@ * Factored the handling of Line Sets out into a separate class. * Fixed a bug that kept a debugging message from beeing printed. + +* Fixed incompatibilities with PHP 5. ]]> </notes> <filelist> Index: pear/Image_GIS/GIS/Parser.php diff -u pear/Image_GIS/GIS/Parser.php:1.7 pear/Image_GIS/GIS/Parser.php:1.8 --- pear/Image_GIS/GIS/Parser.php:1.7 Sun Jan 19 07:19:14 2003 +++ pear/Image_GIS/GIS/Parser.php Sun Sep 28 17:17:44 2003 @@ -13,7 +13,7 @@ // | license@php.net so we can mail you a copy immediately. | // +------------------------------------------------------------------------+ // -// $Id: Parser.php,v 1.7 2003/01/19 12:19:14 sebastian Exp $ +// $Id: Parser.php,v 1.8 2003/09/28 21:17:44 sebastian Exp $ // require_once 'Cache/Lite.php'; @@ -22,7 +22,7 @@ /** * Parser Base Class. * -* @version $Revision: 1.7 $ +* @version $Revision: 1.8 $ * @since Image_GIS 1.0.0 */ class Image_GIS_Parser { @@ -81,8 +81,10 @@ function &factory($parser, $cache, $debug) { include_once 'Image/GIS/Parser/' . $parser . '.php'; - $class = 'Image_GIS_Parser_' . $parser; - return new $class($cache, $debug); + $class = 'Image_GIS_Parser_' . $parser; + $object = new $class($cache, $debug); + + return $object; } /** Index: pear/Image_GIS/GIS/Renderer.php diff -u pear/Image_GIS/GIS/Renderer.php:1.7 pear/Image_GIS/GIS/Renderer.php:1.8 --- pear/Image_GIS/GIS/Renderer.php:1.7 Sun Jan 19 06:24:18 2003 +++ pear/Image_GIS/GIS/Renderer.php Sun Sep 28 17:17:44 2003 @@ -13,7 +13,7 @@ // | license@php.net so we can mail you a copy immediately. | // +------------------------------------------------------------------------+ // -// $Id: Renderer.php,v 1.7 2003/01/19 11:24:18 sebastian Exp $ +// $Id: Renderer.php,v 1.8 2003/09/28 21:17:44 sebastian Exp $ // require_once 'Image/Color.php'; @@ -21,7 +21,7 @@ /** * Renderer Base Class. * -* @version $Revision: 1.7 $ +* @version $Revision: 1.8 $ * @since Image_GIS 1.0.0 */ class Image_GIS_Renderer { @@ -93,8 +93,10 @@ */ function &factory($renderer, $width, $height, $debug) { if (@include_once('Image/GIS/Renderer/' . $renderer . '.php')) { - $class = 'Image_GIS_Renderer_' . $renderer; - return new $class($width, $height, $debug); + $class = 'Image_GIS_Renderer_' . $renderer; + $object = new $class($width, $height, $debug); + + return $object; } }