From 6d7e1bf5bfb0ea029c77709e13a1b5ce247df32a Mon Sep 17 00:00:00 2001 From: Oliver Vogel Date: Thu, 28 Mar 2013 20:12:39 +0100 Subject: [PATCH] universal input possibility for constructor --- src/Intervention/Image/Image.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Intervention/Image/Image.php b/src/Intervention/Image/Image.php index e2cff0d2..028e5216 100644 --- a/src/Intervention/Image/Image.php +++ b/src/Intervention/Image/Image.php @@ -97,11 +97,16 @@ class Image // set image properties if ( ! is_null($source)) { - if (is_resource($source)) { + if ($this->isImageResource($source)) { // image properties come from gd image resource $this->setPropertiesFromResource($source); + } elseif ($this->isBinary($source)) { + + // image properties come from binary image string + $this->setPropertiesFromString($source); + } else { // image properties come from image file @@ -147,10 +152,7 @@ class Image */ public static function raw($string) { - $image = new Image; - $image->setPropertiesFromString($string); - - return $image; + return new Image($string); } /**