X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot_img.php;h=0afdd7b2d8dc5f728492d0dffd32b8ff405bd143;hp=ec6c7db92be9cfd13b6fa7fc23efc0eaf259dfdf;hb=5ece5fdc55596b08577f446ff9432026c798da57;hpb=2a7482575ed5d5d010ca6e54d0b902c682132cd5 diff --git a/phpfspot_img.php b/phpfspot_img.php index ec6c7db..0afdd7b 100644 --- a/phpfspot_img.php +++ b/phpfspot_img.php @@ -22,10 +22,9 @@ class PHPFSPOT_IMG { public function show($idx, $width = "") { - $details = $this->parent->get_photo_details($idx); + $this->parent->gen_thumbs($idx); - foreach(Array($this->parent->cfg->thumb_width, $this->parent->cfg->photo_width) as $resolution) - $this->resize_image($this->parent->translate_path($details['directory_path']) ."/". $details['name'], $resolution); + $details = $this->parent->get_photo_details($idx); if($width == "") $fullpath = $this->parent->translate_path($details['directory_path']) ."/". $details['name']; @@ -50,57 +49,6 @@ class PHPFSPOT_IMG { } // show() - public function resize_image($image, $width) - { - // if thumbnail already exists, don't recreate it - if(file_exists(dirname($image) ."/thumbs/". $width ."_". basename($image))) - return; - - $src_img = @imagecreatefromjpeg($image); - - if($src_img) - { - /* grabs the height and width */ - $new_w = imagesx($src_img); - $new_h = imagesy($src_img); - - // If requested width is more then the actual image width, - // do not generate a thumbnail - - if($width >= $new_w) { - imagedestroy($src_img); - return; - } - - /* calculates aspect ratio */ - $aspect_ratio = $new_h / $new_w; - - /* sets new size */ - $new_w = $width; - $new_h = abs($new_w * $aspect_ratio); - - /* creates new image of that size */ - $dst_img = imagecreatetruecolor($new_w,$new_h); - - imagefill($dst_img, 0, 0, ImageColorAllocate($dst_img, 255, 255, 255)); - - /* copies resized portion of original image into new image */ - imagecopyresampled($dst_img,$src_img,0,0,0,0,$new_w,$new_h,imagesx($src_img),imagesy($src_img)); - - /* write down new generated file */ - - if(!file_exists(dirname($image) ."/thumbs")) - mkdir(dirname($image) ."/thumbs"); - - $newfile = dirname($image) ."/thumbs/". $width ."_". basename($image); - imagejpeg($dst_img, $newfile, 75); - - /* free your mind */ - imagedestroy($dst_img); - imagedestroy($src_img); - } - - } // resize_image() } if(isset($_GET['idx']) && is_numeric($_GET['idx'])) {