X-Git-Url: http://www.aleph1.co.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=web%2Fmodules%2Fcontrib%2Fimagemagick%2Fsrc%2FPlugin%2FImageToolkit%2FOperation%2Fimagemagick%2FCreateNew.php;fp=web%2Fmodules%2Fcontrib%2Fimagemagick%2Fsrc%2FPlugin%2FImageToolkit%2FOperation%2Fimagemagick%2FCreateNew.php;h=37636cf7d36245cd930ed8607c74abd997fd9e3a;hb=f8fc16ae6b862bef59baaad5d051dd37b7ff11b2;hp=1b0c087b7735407e6b707559b680334b5cf575cd;hpb=dd08b95e4e519a02d45a50fb504bf5d685eaa9e3;p=yaffs-website

diff --git a/web/modules/contrib/imagemagick/src/Plugin/ImageToolkit/Operation/imagemagick/CreateNew.php b/web/modules/contrib/imagemagick/src/Plugin/ImageToolkit/Operation/imagemagick/CreateNew.php
index 1b0c087b7..37636cf7d 100644
--- a/web/modules/contrib/imagemagick/src/Plugin/ImageToolkit/Operation/imagemagick/CreateNew.php
+++ b/web/modules/contrib/imagemagick/src/Plugin/ImageToolkit/Operation/imagemagick/CreateNew.php
@@ -75,24 +75,27 @@ class CreateNew extends ImagemagickImageToolkitOperationBase {
    */
   protected function execute(array $arguments) {
     $this->getToolkit()
-      ->resetArguments()
-      ->setSourceLocalPath('')
-      ->setSourceFormatFromExtension($arguments['extension'])
       ->setWidth($arguments['width'])
       ->setHeight($arguments['height'])
       ->setExifOrientation(NULL)
-      ->setFrames(NULL);
+      ->setColorspace($this->getToolkit()->getExecManager()->getPackage() === 'imagemagick' ? 'sRGB' : NULL)
+      ->setProfiles([])
+      ->setFrames(1);
+    $this->getToolkit()->arguments()
+      ->setSourceFormatFromExtension($arguments['extension'])
+      ->setSourceLocalPath('')
+      ->reset();
     $arg = '-size ' . $arguments['width'] . 'x' . $arguments['height'];
 
     // Transparent color syntax for GIF files differs by package.
     if ($arguments['extension'] === 'gif') {
-      switch ($this->getToolkit()->getPackage()) {
+      switch ($this->getToolkit()->getExecManager()->getPackage()) {
         case 'imagemagick':
-          $arg .= ' xc:transparent -transparent-color ' . $this->getToolkit()->escapeShellArg($arguments['transparent_color']);
+          $arg .= ' xc:transparent -transparent-color ' . $this->escapeArgument($arguments['transparent_color']);
           break;
 
         case 'graphicsmagick':
-          $arg .= ' xc:' . $this->getToolkit()->escapeShellArg($arguments['transparent_color']) . ' -transparent ' . $this->getToolkit()->escapeShellArg($arguments['transparent_color']);
+          $arg .= ' xc:' . $this->escapeArgument($arguments['transparent_color']) . ' -transparent ' . $this->escapeArgument($arguments['transparent_color']);
           break;
 
       }
@@ -101,7 +104,7 @@ class CreateNew extends ImagemagickImageToolkitOperationBase {
       $arg .= ' xc:transparent';
     }
 
-    $this->getToolkit()->addArgument($arg);
+    $this->addArgument($arg);
     return TRUE;
   }