Skip to content

Commit

Permalink
Update to fix Implicit conversion
Browse files Browse the repository at this point in the history 
Fix to remove Deprecated: Implicit conversion from float to int loses precision on $width and $height of image
  • Loading branch information
@DaFa66
DaFa66 committed Aug 29, 2022
1 parent 3123d58 commit 8d7fdfc
Showing 1 changed file with 40 additions and 62 deletions.
102 changes: 40 additions & 62 deletions engine/Image.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?php
class Image
{
class Image {
/** @var resource $image */
private $image;

Expand All @@ -13,14 +12,13 @@ class Image
private $contentType = [
IMAGETYPE_JPEG => 'image/jpeg',
IMAGETYPE_GIF => 'image/gif',
IMAGETYPE_PNG =>'image/png',
IMAGETYPE_PNG => 'image/png',
];

/**
* @param null $filename
*/
public function __construct($filename = null)
{
public function __construct($filename = null) {
if (extension_loaded('gd')) {
if ($filename) {
$this->fileName = $filename;
Expand All @@ -34,8 +32,7 @@ public function __construct($filename = null)
}
}

private function checkFileExists($path)
{
private function checkFileExists($path) {
if (!file_exists($path)) {
throw new NotFoundException("$path does not exist");
}
Expand All @@ -46,17 +43,16 @@ private function checkFileExists($path)
* @param string $filename
* @throws NotFoundException
*/
public function load($filename)
{
public function load($filename) {
$this->checkFileExists($filename);
$imageInfo = getimagesize($filename);
$this->imageType = $imageInfo[2];

if( $this->imageType == IMAGETYPE_JPEG ) {
if ($this->imageType == IMAGETYPE_JPEG) {
$this->image = imagecreatefromjpeg($filename);
} elseif( $this->imageType == IMAGETYPE_GIF ) {
} elseif ($this->imageType == IMAGETYPE_GIF) {
$this->image = imagecreatefromgif($filename);
} elseif( $this->imageType == IMAGETYPE_PNG ) {
} elseif ($this->imageType == IMAGETYPE_PNG) {
$this->image = imagecreatefrompng($filename);
}
}
Expand All @@ -67,8 +63,7 @@ public function load($filename)
* @param int $compression
* @param string $permissions
*/
public function save($filename = null, $compression = 100, $permissions = null)
{
public function save($filename = null, $compression = 100, $permissions = null) {
$filename = ($filename) ?: $this->fileName;

switch ($this->getImageType()) {
Expand All @@ -84,7 +79,7 @@ public function save($filename = null, $compression = 100, $permissions = null)
break;
}

if( $permissions !== null) {
if ($permissions !== null) {
chmod($filename, (int) $permissions);
}
}
Expand All @@ -94,8 +89,7 @@ public function save($filename = null, $compression = 100, $permissions = null)
* @param bool $return either output directly
* @return null|string image contents (optional)
*/
public function output($return = false)
{
public function output($return = false) {
$contents = null;
if ($return) {
ob_start();
Expand All @@ -108,8 +102,8 @@ public function output($return = false)
imagegif($this->image);
break;
case IMAGETYPE_PNG:
imagealphablending($this->image,true);
imagesavealpha($this->image,true);
imagealphablending($this->image, true);
imagesavealpha($this->image, true);
imagepng($this->image);
break;
}
Expand All @@ -122,69 +116,63 @@ public function output($return = false)
/**
* @return int
*/
public function getWidth()
{
public function getWidth() {
return imagesx($this->image);
}

/**
* @return int
*/
public function getHeight()
{
public function getHeight() {
return imagesy($this->image);
}

/**
* @param int $height
*/
public function resizeToHeight($height)
{
public function resizeToHeight($height) {
$ratio = $height / $this->getHeight();
$width = $this->getWidth() * $ratio;
$this->resize($width,$height);
$this->resize($width, $height);
}

/**
* @param int $width
*/
public function resizeToWidth($width)
{
public function resizeToWidth($width) {
$ratio = $width / $this->getWidth();
$height = $this->getHeight() * $ratio;
$this->resize($width,$height);
$this->resize($width, $height);
}

/**
* @param int $scale %
*/
public function scale($scale)
{
public function scale($scale) {
$width = $this->getWidth() * $scale / 100;
$height = $this->getHeight() * $scale / 100;
$this->resize($width,$height);
$this->resize($width, $height);
}

/**
* @param int $width
* @param int $height
*/
public function resizeAndCrop($width,$height)
{
public function resizeAndCrop($width, $height) {
$targetRatio = $width / $height;
$actualRatio = $this->getWidth() / $this->getHeight();

if ($targetRatio == $actualRatio) {
// Scale to size
$this->resize($width,$height);
$this->resize($width, $height);
} elseif ($targetRatio > $actualRatio) {
// Resize to width, crop extra height
$this->resizeToWidth($width);
$this->crop($width,$height);
$this->crop($width, $height);
} else {
// Resize to height, crop additional width
$this->resizeToHeight($height);
$this->crop($width,$height);
$this->crop($width, $height);
}
}

Expand All @@ -194,11 +182,10 @@ public function resizeAndCrop($width,$height)
* @param int $width
* @param int $height
*/
public function resize($width,$height)
{
$newImage = imagecreatetruecolor($width, $height);
public function resize($width, $height) {
$newImage = imagecreatetruecolor((int)$width, (int)$height);

if ( ($this->getImageType() == IMAGETYPE_GIF) || ($this->getImageType() == IMAGETYPE_PNG) ) {
if (($this->getImageType() == IMAGETYPE_GIF) || ($this->getImageType() == IMAGETYPE_PNG)) {

// Get transparency color's index number
$transparency = imagecolortransparent($this->image);
Expand All @@ -208,16 +195,15 @@ public function resize($width,$height)

// deal with alpha channels
$this->prepWithExistingIndex($newImage, $transparency);

} elseif ($this->getImageType() == IMAGETYPE_PNG) {
} elseif ($this->getImageType() == IMAGETYPE_PNG) {

// deal with alpha channels
$this->prepTransparentPng($newImage);
}
}

// Now resample the image
imagecopyresampled($newImage, $this->image, 0, 0, 0, 0, $width, $height, $this->getWidth(), $this->getHeight());
imagecopyresampled($newImage, $this->image, 0, 0, 0, 0, (int)$width, (int)$height, $this->getWidth(), $this->getHeight());

// And allocate to $this
$this->image = $newImage;
Expand All @@ -227,8 +213,7 @@ public function resize($width,$height)
* @param $resource
* @param $index
*/
private function prepWithExistingIndex($resource, $index)
{
private function prepWithExistingIndex($resource, $index) {
// Get the array of RGB vals for the transparency index
$transparentColor = imagecolorsforindex($this->image, $index);

Expand All @@ -245,8 +230,7 @@ private function prepWithExistingIndex($resource, $index)
/**
* @param $resource
*/
private function prepTransparentPng($resource)
{
private function prepTransparentPng($resource) {
// Set blending mode as false
imagealphablending($resource, false);

Expand All @@ -266,8 +250,7 @@ private function prepTransparentPng($resource)
* @param int $height
* @param string $trim
*/
public function crop($width,$height, $trim = 'center')
{
public function crop($width, $height, $trim = 'center') {
$offsetX = 0;
$offsetY = 0;
$currentWidth = $this->getWidth();
Expand All @@ -284,25 +267,23 @@ public function crop($width,$height, $trim = 'center')
}
}

$newImage = imagecreatetruecolor($width,$height);
$newImage = imagecreatetruecolor($width, $height);
imagecopyresampled($newImage, $this->image, 0, 0, $offsetX, $offsetY, $width, $height, $width, $height);
$this->image = $newImage;
}

/**
* @return mixed
*/
public function getImageType()
{
public function getImageType() {
return $this->imageType;
}

/**
* @return mixed
* @throws NothingLoadedException
*/
public function getHeader()
{
public function getHeader() {
if (!$this->imageType) {
throw new NothingLoadedException();
}
Expand All @@ -312,16 +293,13 @@ public function getHeader()
/**
* Frees up memory
*/
public function destroy()
{
public function destroy() {
imagedestroy($this->image);
}
}

class NothingLoadedException extends Exception
{
class NothingLoadedException extends Exception {
}

class NotFoundException extends Exception
{
}
class NotFoundException extends Exception {
}

0 comments on commit 8d7fdfc

Please sign in to comment.