Changeset 9127 for temp/trunk

Timestamp:

2006/11/27 12:58:19 (20 years ago)

Author:

kakinaka

Message:

blank

Location:

temp/trunk

Files:

• data/class/SC_Image.php (modified) (3 diffs)
• html/admin/products/product.php (modified) (2 diffs)

temp/trunk/data/class/SC_Image.php

@@ -64 +64 @@
         $zip_height = $src_h * $zip_scale;
         
-        //¸µ²èÁü
-        $src_im = ImageCreateFromJPEG($file);
-        
-        // °µ½ÌÀè²èÁü
-        $dst_im = imagecreatetruecolor($zip_width, $zip_height);    
-        imagecopyresampled($dst_im, $src_im, 0, 0, 0,0, $zip_width, $zip_height, $src_w, $src_h);
-
         // ¥Õ¥¡¥¤¥ë¤Î³ÈÄ¥»Ò¼èÆÀ 
         $arrFileInfo = pathinfo($file);
@@ -77 +70 @@
         // °ì°Õ¤ÊID¤ò¼èÆÀ¤¹¤ë¡£
         $uniqname = date("mdHi") . "_" . uniqid("");
-
+        
         // ¥Õ¥¡¥¤¥ë̾¡¢ÊݸÀèÀßÄê
         $filename = $uniqname . "." . $extension;
@@ -87 +80 @@
                 case "jpg":
                 case "jpeg":
+                    //¸µ²èÁü
+                    $src_im = ImageCreateFromJPEG($file);
+                    
+                    // °µ½ÌÀè²èÁü
+                    $dst_im = imagecreatetruecolor($zip_width, $zip_height);    
+                    imagecopyresampled($dst_im, $src_im, 0, 0, 0,0, $zip_width, $zip_height, $src_w, $src_h);
+                    
                     ImageJPEG($dst_im, $path);
                     break;
                 case "gif":
+                    //¸µ²èÁü
+                    $src_im = ImageCreateFromGIF($file);
+                    
+                    // °µ½ÌÀè²èÁü
+                    $dst_im = imagecreatetruecolor($zip_width, $zip_height);    
+                    imagecopyresampled($dst_im, $src_im, 0, 0, 0,0, $zip_width, $zip_height, $src_w, $src_h);
+                    
                     ImageGIF($dst_im, $path);
                     break;
                 case "png":
+                    //¸µ²èÁü
+                    $src_im = ImageCreateFromPNG($file);
+                    
+                    // °µ½ÌÀè²èÁü
+                    $dst_im = imagecreatetruecolor($zip_width, $zip_height);    
+                    imagecopyresampled($dst_im, $src_im, 0, 0, 0,0, $zip_width, $zip_height, $src_w, $src_h);
+                    
                     ImagePNG($dst_im, $path);
                     break;

temp/trunk/html/admin/products/product.php

@@ -509 +509 @@
             list($src_w, $src_h) = getimagesize($src_path);
             
-            sfprintr($arrImageKey["main_large_image"]);
-            sfprintr($src_path);
-            sfprintr($src_w);
-        
             // ½Ì¾®Î¨ÀßÄê
             ($src_w > $src_h) ? $scale = SMALL_IMAGE_WIDTH / $src_w : $scale = SMALL_IMAGE_HEIGHT / $src_h;
@@ -519 +515 @@
             
             // ½Ì¾®Î¨ÀßÄê
-            (LARGE_IMAGE_WIDTH > LARGE_IMAGE_HEIGHT) ? $scale = NORMAL_IMAGE_WIDTH / LARGE_IMAGE_WIDTH : $scale = NORMAL_IMAGE_HEIGHT / LARGE_IMAGE_HEIGHT;
+            ($src_w > $src_h) ? $scale = NORMAL_IMAGE_WIDTH / $src_w : $scale = NORMAL_IMAGE_WIDTH / $src_h;
             $path = $objUpFile->saveResizeImage($_POST['image_key'], $scale);
             $objUpFile->temp_file[$arrImageKey["main_image"]] = $path;