From d6f346200a26623b910afb80ab339d34d0114ce8 Mon Sep 17 00:00:00 2001 From: Fascinated Date: Sat, 8 Jul 2023 00:51:33 +0100 Subject: [PATCH] revert to not using Imagick --- Dockerfile | 2 +- upload.php | 25 +++++-------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/Dockerfile b/Dockerfile index f9a0851..ab66bb0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM alpine:3.18.2 # Install dependencies RUN apk update && \ apk upgrade && \ - apk add --no-cache nginx php81 php81-fpm php81-pecl-imagick && \ + apk add --no-cache nginx php81 php81-fpm php81-gd && \ rm -rf /var/cache/apk/* # Set up nginx diff --git a/upload.php b/upload.php index 9ce8692..7915df5 100644 --- a/upload.php +++ b/upload.php @@ -162,28 +162,13 @@ try { // Check the file type and size if ($shouldConvertToWebp && in_array($fileType, ["png", "jpeg", "jpg"]) && $_FILES["sharex"]["size"] > $webpThreadhold) { - // Create an Imagick object from the uploaded file - $image = new Imagick($_FILES["sharex"]["tmp_name"]); - - // Convert the image to WebP - $image->setImageFormat("webp"); - $image->setImageCompressionQuality($webpQuality); - - // Set the output filename + $image = imagecreatefromstring(file_get_contents($_FILES["sharex"]["tmp_name"])); $webp_file = pathinfo($finalName, PATHINFO_FILENAME) . ".webp"; - - // Save the converted image - $image->writeImage($webp_file); - - // Free up memory - $image->clear(); - $image->destroy(); - - $fileSize = filesize($webp_file); // Update the file size - - // Update the final filename + imagewebp($image, $webp_file, 90); // Convert the image and save it + imagedestroy($image); // Free up memory $finalName = $webp_file; - $needsToBeSaved = false; + $shouldSave = false; + $fileSize = filesize($webp_file); // Update the file size } if ($needsToBeSaved) { // Save the file if it has not been saved yet