From 981fce35a064e1d8e6a676c3f3c7f0ed060d3e98 Mon Sep 17 00:00:00 2001 From: Kubwa Date: Sun, 29 Nov 2020 17:26:32 +0100 Subject: [PATCH] Added automatic check for imageick extension and usage --- classes/GridUserInfo.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/classes/GridUserInfo.php b/classes/GridUserInfo.php index 97e1d37..f833215 100644 --- a/classes/GridUserInfo.php +++ b/classes/GridUserInfo.php @@ -262,8 +262,14 @@ $AssetImageData = HttpRequest($AssetURI, "", "", 3); $TempName = $this->MySql->id(8); file_put_contents("binary_helper/".$TempName.".jp2", $AssetImageData); - //Should be the same for Windows and Unix... If not, only God can help you... or Google (which is the same) - shell_exec("binary_helper".DIRECTORY_SEPARATOR."magick convert binary_helper/".$TempName.".jp2 binary_helper/".$TempName.".jpg"); + if (extension_loaded("imagick")) + { + $Image = new Imagick(realpath("./binary_helper/".$TempName.".jp2")); + $Image->setImageFormat("jpg"); + $Image->writeImage(realpath("./binary_helper/".$TempName.".jpg")); + } + else + {shell_exec("binary_helper".DIRECTORY_SEPARATOR."magick convert binary_helper/".$TempName.".jp2 binary_helper/".$TempName.".jpg");} $AssetImageData = file_get_contents("binary_helper/".$TempName.".jpg"); @unlink("binary_helper/".$TempName.".jp2"); @unlink("binary_helper/".$TempName.".jpg");