[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [12403] update function call
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [12403] update function call |
Date: |
Fri, 28 Nov 2014 18:56:15 +0000 |
Revision: 12403
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12403
Author: sigurdne
Date: 2014-11-28 18:56:12 +0000 (Fri, 28 Nov 2014)
Log Message:
-----------
update function call
Modified Paths:
--------------
trunk/phpgwapi/inc/pdf/extensions/CezTableImage.php
Modified: trunk/phpgwapi/inc/pdf/extensions/CezTableImage.php
===================================================================
--- trunk/phpgwapi/inc/pdf/extensions/CezTableImage.php 2014-11-28 15:27:03 UTC
(rev 12402)
+++ trunk/phpgwapi/inc/pdf/extensions/CezTableImage.php 2014-11-28 18:56:12 UTC
(rev 12403)
@@ -691,7 +691,8 @@
$height = 0;
$matches = $this->getImagesFromText($text);
for ($key=0; $key<count($matches[0]); $key++) {
- $params = &
CezShowimageParameter::create($matches[1][$key]);
+ $CezShowimageParameter = new CezShowimageParameter();
+ $params =
$CezShowimageParameter->create($matches[1][$key]);
if ($params->getHeight()>0) {
$height = $height + $params->getHeight();
} else {
@@ -707,9 +708,12 @@
* @param CezShowimageParameter $params image parameter
* @param float $x horizontal position
* @param float $y vertical position
+ * @param $w width
+ * @param $h height
+ * @param $quality image quality
* @access protected
*/
- function addImage(& $params, $x = 0, $y = 0,$w=0,$h=0,$quality=75) {
+ function addImage(& $params, $x = 0, $y = 0, $w=0,$h=0,$quality=75) {
if ($params->isUrl()) {
if (function_exists('imagecreatefrompng')) {
switch($params->getImageType()) {
@@ -753,7 +757,8 @@
*/
function showimage($info) {
if ($info['status']=='start') {
- $params = & CezShowimageParameter::create($info['p']);
+ $CezShowimageParameter = new CezShowimageParameter();
+ $params = $CezShowimageParameter->create($info['p']);
if ($params->isReadable()) {
$y = ($params->getPositionY()>0) ?
$params->getPositionY() : $info['y'];
$this->addImage($params, $info['x'], $y);
@@ -776,7 +781,9 @@
function parseImages(&$text, $maxwidth = 0, $maxheight = 0, $currenty =
0) {
$matches = $this->getImagesFromText($text);
for ($key=0; $key<count($matches[0]); $key++) {
- $params = &
CezShowimageParameter::create($matches[1][$key]);
+ $CezShowimageParameter = new CezShowimageParameter();
+ $params =
$CezShowimageParameter->create($matches[1][$key]);
+
if ($params->isReadable()) {
$width = $params->getWidth();
$height = $params->getHeight();
@@ -819,7 +826,8 @@
$mx = 0;
$matches = $this->getImagesFromText($text);
for ($key=0; $key<count($matches[0]); $key++) {
- $params = &
CezShowimageParameter::create($matches[1][$key]);
+ $CezShowimageParameter = new CezShowimageParameter();
+ $params =
$CezShowimageParameter->create($matches[1][$key]);
if ($params->getWidth()>$mx) {
$mx = $params->getWidth();
} elseif ($params->getOriginalWidth()>$mx) {
@@ -968,7 +976,7 @@
* @return CezShowimageParameter parameter object
* @access public
*/
- function & create($param = '') {
+ function create($param = '') {
$obj = new CezShowimageParameter();
$obj->_parse($param);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [12403] update function call,
Sigurd Nes <=