- Update to 0.3.2

PR:		146453
Submitted by:	olli hauer <ohauer@gmx.de> (maintainer)
This commit is contained in:
Martin Wilke 2010-06-02 16:28:38 +00:00
parent 874dfc4f1b
commit be38e15323
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=255557
6 changed files with 95 additions and 13 deletions

View File

@ -6,8 +6,7 @@
#
PORTNAME= Image_Canvas
PORTVERSION= 0.3.0
PORTREVISION= 1
PORTVERSION= 0.3.2
CATEGORIES= graphics www pear
MAINTAINER= numisemis@yahoo.com
@ -17,16 +16,18 @@ BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${PEARDIR}/Image/Color.php:${PORTSDIR}/graphics/pear-Image_Color
USE_PHP= gd
USE_DOS2UNIX= yes
CATEGORY= Image
FILES= Canvas.php Canvas/Color.php Canvas/GD.php \
Canvas/ImageMap.php Canvas/PDF.php Canvas/SVG.php \
Canvas/Tool.php Canvas/WithMap.php Canvas/Fonts/fontmap.txt \
Canvas/Fonts/README Canvas/GD/JPG.php Canvas/GD/PNG.php
FILES= Image/Canvas.php Image/Canvas/Color.php Image/Canvas/GD.php \
Image/Canvas/ImageMap.php Image/Canvas/PDF.php Image/Canvas/PS.php \
Image/Canvas/SVG.php Image/Canvas/SWF.php Image/Canvas/Tool.php \
Image/Canvas/WithMap.php Image/Canvas/Fonts/fontmap.txt \
Image/Canvas/Fonts/README Image/Canvas/GD/JPG.php \
Image/Canvas/GD/PNG.php
TESTS= canvas_body.php gradients.php imagemap.php jpg.php \
lineends.php pdf.php pear-icon.png png.php README svg.php \
text.php
DOCS= ChangeLog README
lineends.php pdf.php pear-icon.png png.php ps.php \
README svg.php text.php
DOCS= ChangeLog README TODO
EXAMPLES= canvas.php pear-icon.png
_EXAMPLESDIR= docs/examples

View File

@ -1,3 +1,3 @@
MD5 (PEAR/Image_Canvas-0.3.0.tgz) = 41dd36fb05436159fb6fccca02cb7aaa
SHA256 (PEAR/Image_Canvas-0.3.0.tgz) = 1b3883e84553e04ee70c863671aebeee3499cbbb9a59c1889ce77a514ece24ca
SIZE (PEAR/Image_Canvas-0.3.0.tgz) = 43423
MD5 (PEAR/Image_Canvas-0.3.2.tgz) = 0ffb421ade2f9c8234861cc73550e503
SHA256 (PEAR/Image_Canvas-0.3.2.tgz) = f0d6a82b5a8c0f82cb82c4c068862823d14da2fe07a48663dec666ddd1300264
SIZE (PEAR/Image_Canvas-0.3.2.tgz) = 54698

View File

@ -0,0 +1,20 @@
--- ./Image/Canvas.php.orig 2010-05-15 11:53:04.000000000 +0200
+++ ./Image/Canvas.php 2010-05-15 11:53:51.000000000 +0200
@@ -730,7 +730,7 @@
$error = 'PHP extension ming is required for output in swf format.';
$error .= 'Please install the ming extension (http://de.php.net/ming).';
- $error =& new PEAR_Error($error);
+ $error = new PEAR_Error($error);
return $error;
}
}
@@ -742,7 +742,7 @@
$class = 'Image_Canvas_'. $canvas;
include_once 'Image/Canvas/'. str_replace('_', '/', $canvas) . '.php';
- $obj =& new $class($params);
+ $obj = new $class($params);
return $obj;
}

View File

@ -0,0 +1,23 @@
--- ./Image/Canvas/GD.php.orig 2010-05-15 11:53:04.000000000 +0200
+++ ./Image/Canvas/GD.php 2010-05-15 11:53:04.000000000 +0200
@@ -1770,7 +1770,7 @@
$php_info = ob_get_contents();
ob_end_clean();
- if (ereg("<td[^>]*>GD Version *<\/td><td[^>]*>([^<]*)<\/td>",
+ if (preg_match("/<td[^>]*>GD Version *<\/td><td[^>]*>([^<]*)<\/td>/",
$php_info, $result))
{
$version = $result[1];
@@ -1779,9 +1779,9 @@
}
}
- if (ereg('1\.[0-9]{1,2}', $version)) {
+ if (preg_match('/1\.[0-9]{1,2}/', $version)) {
return 1;
- } elseif (ereg('2\.[0-9]{1,2}', $version)) {
+ } elseif (preg_match('/2\.[0-9]{1,2}/', $version)) {
return 2;
} else {
return 0;

View File

@ -0,0 +1,19 @@
--- ./Image/Canvas/PDF.php.orig 2010-05-15 11:53:04.000000000 +0200
+++ ./Image/Canvas/PDF.php 2010-05-15 11:53:04.000000000 +0200
@@ -993,14 +993,14 @@
$php_info = ob_get_contents();
ob_end_clean();
- if (ereg("<td[^>]*>PDFlib GmbH Version *<\/td><td[^>]*>([^<]*)<\/td>",
+ if (preg_match("/<td[^>]*>PDFlib GmbH Version *<\/td><td[^>]*>([^<]*)<\/td>/",
$php_info, $result))
{
$version = $result[1];
}
}
- if (ereg('([0-9]{1,2})\.[0-9]{1,2}(\.[0-9]{1,2})?', trim($version), $result)) {
+ if (preg_match('/([0-9]{1,2})\.[0-9]{1,2}(\.[0-9]{1,2})?/', trim($version), $result)) {
return $result[1];
} else {
return $version;

View File

@ -0,0 +1,19 @@
--- ./Image/Canvas/PS.php.orig 2010-05-15 11:53:04.000000000 +0200
+++ ./Image/Canvas/PS.php 2010-05-15 11:53:04.000000000 +0200
@@ -991,14 +991,14 @@
$php_info = ob_get_contents();
ob_end_clean();
- if (ereg("<td[^>]*>pslib Version *<\/td><td[^>]*>([^<]*)<\/td>",
+ if (preg_match("/<td[^>]*>pslib Version *<\/td><td[^>]*>([^<]*)<\/td>/",
$php_info, $result))
{
$version = $result[1];
}
}
- if (ereg('([0-9]{1,2})\.[0-9]{1,2}(\.[0-9]{1,2})?', trim($version), $result)) {
+ if (preg_match('/([0-9]{1,2})\.[0-9]{1,2}(\.[0-9]{1,2})?/', trim($version), $result)) {
return $result[1];
} else {
return $version;