revert: Return rokka/vips to normal dependencies

There is a plan to include libvips in the distributed and downloaded shared libraries to make it easier to switch to Vips

Author: CodeWithKyrian

composer.json

@@ -21,12 +21,12 @@
     "rindow/rindow-math-matrix": "^2.0",
     "rindow/rindow-matlib-ffi": "^1.0",
     "rindow/rindow-openblas-ffi": "^1.0",
-    "symfony/console": "^6.4|^7.0"
+    "symfony/console": "^6.4|^7.0",
+    "rokka/imagine-vips": "^0.31.0"
   },
   "require-dev": {
     "pestphp/pest": "^2.31",
-    "symfony/var-dumper": "^7.0",
-    "rokka/imagine-vips": "^0.31.0"
+    "symfony/var-dumper": "^7.0"
   },
   "suggest": {
     "ext-imagick": "Required to use the Imagick Driver for image processing",

examples/bootstrap.php

@@ -7,5 +7,5 @@
 
 require_once './vendor/autoload.php';
 
-Transformers::setup()->setImageDriver(ImageDriver::IMAGICK);
+Transformers::setup()->setImageDriver(ImageDriver::VIPS);
 

examples/misc/background-removal.php

@@ -5,12 +5,10 @@
 use Codewithkyrian\Transformers\Models\Auto\AutoModel;
 use Codewithkyrian\Transformers\Processors\AutoProcessor;
 use Codewithkyrian\Transformers\Utils\Image;
-use function Codewithkyrian\Transformers\Utils\{memoryUsage, timeUsage};
+use function Codewithkyrian\Transformers\Utils\{memoryPeak, memoryUsage, timeUsage};
 
 require_once './bootstrap.php';
 
-ini_set('memory_limit', '256M');
-
 $modelConfig = ['model_type' => 'custom'];
 $processorConfig = [
     'do_normalize' => true,
@@ -46,5 +44,5 @@
 
 $maskedImage->save($fileName . '-masked.png');
 
-dd('Done Processing!', timeUsage(), memoryUsage());
+dd('Done Processing!', timeUsage(), memoryUsage(), memoryPeak());
 

src/Utils/Image.php

@@ -13,6 +13,7 @@
 use Imagine\Image\ImageInterface;
 use Imagine\Image\Metadata\MetadataBag;
 use Imagine\Image\Point;
+use Imagine\Vips\Imagine;
 use InvalidArgumentException;
 use RuntimeException;
 
@@ -91,18 +92,19 @@ public static function setDriver(ImageDriver $imageDriver): void
         self::$imagine = match ($imageDriver) {
             ImageDriver::IMAGICK => new \Imagine\Imagick\Imagine(),
             ImageDriver::GD => new \Imagine\Gd\Imagine(),
-            ImageDriver::VIPS => new \Imagine\Vips\Imagine(),
+            ImageDriver::VIPS => new Imagine(),
         };
+
+        if ($imageDriver === ImageDriver::VIPS) {
+            $libsDir = basePath('libs');
+            putenv("VIPSHOME=$libsDir");
+        }
     }
 
     public static function getImagine(): AbstractImagine
     {
         if (!isset(self::$imagine)) {
-            self::$imagine = match (Transformers::getImageDriver()) {
-                ImageDriver::IMAGICK => new \Imagine\Imagick\Imagine(),
-                ImageDriver::GD => new \Imagine\Gd\Imagine(),
-                ImageDriver::VIPS => new \Imagine\Vips\Imagine(),
-            };
+            self::setDriver(Transformers::getImageDriver());
         }
 
         return self::$imagine;
@@ -183,9 +185,9 @@ public function thumbnail(int $width, int $height, int|Resample $resample = 2):
         }
 
         if ($inputHeight > $inputWidth) {
-	        $width = (int)floor($inputWidth * $height / $inputHeight);
+            $width = (int)floor($inputWidth * $height / $inputHeight);
         } elseif ($inputWidth > $inputHeight) {
-	        $height = (int)floor($inputHeight * $width / $inputWidth);
+            $height = (int)floor($inputHeight * $width / $inputWidth);
         }
 
         return $this->resize($width, $height, $resample);