Merge branch 'feat/submission_attachments_route' of github.com:theus7…

…7/elasticms into feat/submission_attachments_route
theus77 · Oct 25, 2023 · b25570c · b25570c
2 parents b67dd32 + e61d759
commit b25570c
Show file tree

Hide file tree

Showing 3 changed files with 431 additions and 3 deletions.
diff --git a/EMS/common-bundle/src/Storage/Processor/Image.php b/EMS/common-bundle/src/Storage/Processor/Image.php
@@ -6,6 +6,7 @@
 
 use EMS\CommonBundle\Common\Standard\Type;
 use EMS\CommonBundle\Helper\EmsFields;
+use EMS\Helpers\Image\SmartCrop;
 use EMS\Helpers\Standard\Color;
 use Psr\Log\LoggerInterface;
 
@@ -140,11 +141,21 @@ private function fillBackgroundColor(\GdImage $temp): void
 
     private function applyResizeAndBackground(\GdImage $image, int $width, int $height, int $originalWidth, int $originalHeight): \GdImage
     {
-        $temp = $this->imageCreate($width, $height);
+        $resize = $this->config->getResize();
+        if ('smartCrop' === $resize) {
+            $smartCrop = new SmartCrop($image, $width, $height);
+            $res = $smartCrop->analyse();
+            if (null === $res['topCrop']) {
+                $resize = 'fillArea';
+            } else {
+                $smartCrop->crop($res['topCrop']['x'], $res['topCrop']['y'], $res['topCrop']['width'], $res['topCrop']['height']);
 
-        $this->fillBackgroundColor($temp);
+                return $smartCrop->get();
+            }
+        }
 
-        $resize = $this->config->getResize();
+        $temp = $this->imageCreate($width, $height);
+        $this->fillBackgroundColor($temp);
         $gravity = $this->config->getGravity();
 
         if ('fillArea' == $resize) {