Upgrade jpgrah to 4.3.4

This commit is contained in:
Nigel Sheldon 2021-01-03 17:10:26 +01:00
commit b5868f05f6
72 changed files with 19157 additions and 10327 deletions

View file

@ -1,13 +1,13 @@
<?php
/*=======================================================================
// File: JPGRAPH_CANVAS.PHP
// Description: Canvas drawing extension for JpGraph
// Created: 2001-01-08
// Ver: $Id: jpgraph_canvas.php 781 2006-10-08 08:07:47Z ljp $
//
// Copyright (c) Aditus Consulting. All rights reserved.
//========================================================================
*/
// File: JPGRAPH_CANVAS.PHP
// Description: Canvas drawing extension for JpGraph
// Created: 2001-01-08
// Ver: $Id: jpgraph_canvas.php 1923 2010-01-11 13:48:49Z ljp $
//
// Copyright (c) Asial Corporation. All rights reserved.
//========================================================================
*/
//===================================================
// CLASS CanvasGraph
@ -21,9 +21,9 @@ class CanvasGraph extends Graph
{
//---------------
// CONSTRUCTOR
public function CanvasGraph($aWidth=300, $aHeight=200, $aCachedName="", $timeout=0, $inline=1)
public function __construct($aWidth=300, $aHeight=200, $aCachedName="", $timeout=0, $inline=1)
{
$this->Graph($aWidth, $aHeight, $aCachedName, $timeout, $inline);
parent::__construct($aWidth, $aHeight, $aCachedName, $timeout, $inline);
}
//---------------
@ -66,12 +66,12 @@ class CanvasGraph extends Graph
if (!$_csim) {
// Should we do any final image transformation
// Should we do any final image transformation
if ($this->iImgTrans) {
if (!class_exists('ImgTrans')) {
if (!class_exists('ImgTrans', false)) {
require_once('jpgraph_imgtrans.php');
}
$tform = new ImgTrans($this->img->img);
$this->img->img = $tform->Skew3D(
$this->iImgTransHorizon,
@ -83,7 +83,7 @@ class CanvasGraph extends Graph
$this->iImgTransBorder
);
}
// If the filename is given as the special _IMG_HANDLER
// then the image handler is returned and the image is NOT