Fixed #1134; Consolidated image scaling functions.

3 files changed, 28 insertions, 227 deletions

diff --git a/classes/Avatar.php b/classes/Avatar.php
index 9ae920647..6a9ea7686 100644
--- a/classes/Avatar.php
+++ b/classes/Avatar.php
@@ -36,102 +36,6 @@ class Avatar extends Memcached_DataObject
             @unlink(common_avatar_path($filename));
         }
     }
-
-    # Create and save scaled version of this avatar
-    # XXX: maybe break into different methods
-
-    function scale($size)
-    {
-
-        $image_s = imagecreatetruecolor($size, $size);
-        $image_a = $this->to_image();
-        $square = min($this->width, $this->height);
-        imagecolortransparent($image_s, imagecolorallocate($image_s, 0, 0, 0));
-        imagealphablending($image_s, false);
-        imagesavealpha($image_s, true);
-        imagecopyresampled($image_s, $image_a, 0, 0, 0, 0,
-                           $size, $size, $square, $square);
-
-        $ext = ($this->mediattype == 'image/jpeg') ? ".jpeg" : ".png";
-
-        $filename = common_avatar_filename($this->profile_id, $ext, $size, common_timestamp());
-
-        if ($this->mediatype == 'image/jpeg') {
-            imagejpeg($image_s, common_avatar_path($filename));
-        } else {
-            imagepng($image_s, common_avatar_path($filename));
-        }
-
-        $scaled = DB_DataObject::factory('avatar');
-        $scaled->profile_id = $this->profile_id;
-        $scaled->width = $size;
-        $scaled->height = $size;
-        $scaled->original = false;
-        $scaled->mediatype = ($this->mediattype == 'image/jpeg') ? 'image/jpeg' : 'image/png';
-        $scaled->filename = $filename;
-        $scaled->url = common_avatar_url($filename);
-        $scaled->created = DB_DataObject_Cast::dateTime(); # current time
-
-        if ($scaled->insert()) {
-            return $scaled;
-        } else {
-            return null;
-        }
-    }
-
-    function scale_and_crop($size, $x, $y, $w, $h) 
-    {
-
-        $image_s = imagecreatetruecolor($size, $size);
-        $image_a = $this->to_image();
-
-        # Retain alpha channel info if possible for .pngs
-        $background = imagecolorallocate($image_s, 0, 0, 0);
-        ImageColorTransparent($image_s, $background);
-        imagealphablending($image_s, false);
-
-        imagecopyresized($image_s, $image_a, 0, 0, $x, $y, $size, $size, $w, $h);
-
-        $ext = ($this->mediattype == 'image/jpeg') ? ".jpeg" : ".png";
-
-        $filename = common_avatar_filename($this->profile_id, $ext, $size, common_timestamp());
-
-        if ($this->mediatype == 'image/jpeg') {
-            imagejpeg($image_s, common_avatar_path($filename));
-        } else {
-            imagepng($image_s, common_avatar_path($filename));
-        }
-
-        $cropped = DB_DataObject::factory('avatar');
-        $cropped->profile_id = $this->profile_id;
-        $cropped->width = $size;
-        $cropped->height = $size;
-        $cropped->original = false;
-        $cropped->mediatype = ($this->mediattype == 'image/jpeg') ? 'image/jpeg' : 'image/png';
-        $cropped->filename = $filename;
-        $cropped->url = common_avatar_url($filename);
-        $cropped->created = DB_DataObject_Cast::dateTime(); # current time
-
-        if ($cropped->insert()) {
-            return $cropped;
-        } else {
-            return NULL;
-        }
-    }
-
-    function to_image() 
-    {
-        $filepath = common_avatar_path($this->filename);
-        if ($this->mediatype == 'image/gif') {
-            return imagecreatefromgif($filepath);
-        } else if ($this->mediatype == 'image/jpeg') {
-            return imagecreatefromjpeg($filepath);
-        } else if ($this->mediatype == 'image/png') {
-            return imagecreatefrompng($filepath);
-        } else {
-            return NULL;
-        }
-    }
     
     function &pkeyGet($kv) 
     {
diff --git a/classes/Profile.php b/classes/Profile.php
index ab5a48e57..5be632f87 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -69,28 +69,15 @@ class Profile extends Memcached_DataObject
         }
     }
 
-    function setOriginal($source)
+    function setOriginal($filename)
     {
-
-        $info = @getimagesize($source);
-
-        if (!$info) {
-            return null;
-        }
-
-        $filename = common_avatar_filename($this->id,
-                                           image_type_to_extension($info[2]),
-                                           null, common_timestamp());
-        $filepath = common_avatar_path($filename);
-
-        copy($source, $filepath);
+        $imagefile = new ImageFile($this->id, common_avatar_path($filename));
 
         $avatar = new Avatar();
-
         $avatar->profile_id = $this->id;
-        $avatar->width = $info[0];
-        $avatar->height = $info[1];
-        $avatar->mediatype = image_type_to_mime_type($info[2]);
+        $avatar->width = $imagefile->width;
+        $avatar->height = $imagefile->height;
+        $avatar->mediatype = image_type_to_mime_type($imagefile->type);
         $avatar->filename = $filename;
         $avatar->original = true;
         $avatar->url = common_avatar_url($filename);
@@ -98,21 +85,29 @@ class Profile extends Memcached_DataObject
 
         # XXX: start a transaction here
 
-        if (!$this->delete_avatars()) {
-            @unlink($filepath);
-            return null;
-        }
-
-        if (!$avatar->insert()) {
-            @unlink($filepath);
+        if (!$this->delete_avatars() || !$avatar->insert()) {
+            @unlink(common_avatar_path($filename));
             return null;
         }
 
         foreach (array(AVATAR_PROFILE_SIZE, AVATAR_STREAM_SIZE, AVATAR_MINI_SIZE) as $size) {
             # We don't do a scaled one if original is our scaled size
             if (!($avatar->width == $size && $avatar->height == $size)) {
-                $s = $avatar->scale($size);
-                if (!$s) {
+                
+                $scaled_filename = $imagefile->resize($size);
+                
+                //$scaled = DB_DataObject::factory('avatar');
+                $scaled = new Avatar();
+                $scaled->profile_id = $this->id;
+                $scaled->width = $size;
+                $scaled->height = $size;
+                $scaled->original = false;
+                $scaled->mediatype = image_type_to_mime_type($imagefile->type);
+                $scaled->filename = $scaled_filename;
+                $scaled->url = common_avatar_url($scaled_filename);
+                $scaled->created = DB_DataObject_Cast::dateTime(); # current time
+
+                if (!$scaled->insert()) {
                     return null;
                 }
             }
@@ -121,24 +116,6 @@ class Profile extends Memcached_DataObject
         return $avatar;
     }
 
-    function crop_avatars($x, $y, $w, $h)
-    {
-
-        $avatar = $this->getOriginalAvatar();
-        $this->delete_avatars(false); # don't delete original
-
-        foreach (array(AVATAR_PROFILE_SIZE, AVATAR_STREAM_SIZE, AVATAR_MINI_SIZE) as $size) {
-            # We don't do a scaled one if original is our scaled size
-            if (!($avatar->width == $size && $avatar->height == $size)) {
-                $s = $avatar->scale_and_crop($size, $x, $y, $w, $h);
-                if (!$s) {
-                    return NULL;
-                }
-            }
-        }
-        return true;
-    }
-
     function delete_avatars($original=true)
     {
         $avatar = new Avatar();
diff --git a/classes/User_group.php b/classes/User_group.php
index 092c1bc34..340d7f67a 100755
--- a/classes/User_group.php
+++ b/classes/User_group.php
@@ -88,96 +88,16 @@ class User_group extends Memcached_DataObject
         return $members;
     }
 
-    function setOriginal($filename, $type)
+    function setOriginal($filename)
     {
+        $imagefile = new ImageFile($this->id, common_avatar_path($filename));
+        
         $orig = clone($this);
         $this->original_logo = common_avatar_url($filename);
-        $this->homepage_logo = common_avatar_url($this->scale($filename,
-                                                              AVATAR_PROFILE_SIZE,
-                                                              $type));
-        $this->stream_logo = common_avatar_url($this->scale($filename,
-                                                            AVATAR_STREAM_SIZE,
-                                                            $type));
-        $this->mini_logo = common_avatar_url($this->scale($filename,
-                                                          AVATAR_MINI_SIZE,
-                                                          $type));
+        $this->homepage_logo = common_avatar_url($imagefile->resize(AVATAR_PROFILE_SIZE));
+        $this->stream_logo = common_avatar_url($imagefile->resize(AVATAR_STREAM_SIZE));
+        $this->mini_logo = common_avatar_url($imagefile->resize(AVATAR_MINI_SIZE));
         common_debug(common_log_objstring($this));
         return $this->update($orig);
     }
-
-    function scale($filename, $size, $type)
-    {
-        $filepath = common_avatar_path($filename);
-
-        if (!file_exists($filepath)) {
-            $this->serverError(_('Lost our file.'));
-            return;
-        }
-
-        $info = @getimagesize($filepath);
-
-        switch ($type) {
-         case IMAGETYPE_GIF:
-            $image_src = imagecreatefromgif($filepath);
-            break;
-         case IMAGETYPE_JPEG:
-            $image_src = imagecreatefromjpeg($filepath);
-            break;
-         case IMAGETYPE_PNG:
-            $image_src = imagecreatefrompng($filepath);
-            break;
-         default:
-            $this->serverError(_('Unknown file type'));
-            return;
-        }
-
-        $image_dest = imagecreatetruecolor($size, $size);
-        
-        if ($type == IMAGETYPE_GIF || $type == IMAGETYPE_PNG) {
-
-            $transparent_idx = imagecolortransparent($image_src);
-            
-            if ($transparent_idx >= 0) {
-                
-                $transparent_color = imagecolorsforindex($image_src, $transparent_idx);
-                $transparent_idx = imagecolorallocate($image_dest, $transparent_color['red'], $transparent_color['green'], $transparent_color['blue']);
-                imagefill($image_dest, 0, 0, $transparent_idx);
-                imagecolortransparent($image_dest, $transparent_idx);
-                
-            } elseif ($type == IMAGETYPE_PNG) {
-                
-                imagealphablending($image_dest, false);
-                $transparent = imagecolorallocatealpha($image_dest, 0, 0, 0, 127);
-                imagefill($image_dest, 0, 0, $transparent);
-                imagesavealpha($image_dest, true);
-                
-            }
-        }
-
-        imagecopyresampled($image_dest, $image_src, 0, 0, 0, 0, $size, $size, $info[0], $info[1]);
-
-        $outname = common_avatar_filename($this->id,
-                                          image_type_to_extension($type),
-                                          $size,
-                                          common_timestamp());
-
-        $outpath = common_avatar_path($outname);
-
-        switch ($type) {
-         case IMAGETYPE_GIF:
-            imagegif($image_dest, $outpath);
-            break;
-         case IMAGETYPE_JPEG:
-            imagejpeg($image_dest, $outpath);
-            break;
-         case IMAGETYPE_PNG:
-            imagepng($image_dest, $outpath);
-            break;
-         default:
-            $this->serverError(_('Unknown file type'));
-            return;
-        }
-
-        return $outname;
-    }
 }