Changeset 9132 for temp/trunk/html

Timestamp:

2006/11/27 13:21:42 (20 years ago)

Author:

kakinaka

Message:

blank

File:

• temp/trunk/html/admin/products/product.php (modified) (1 diff)

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

@@ -548 +548 @@
 
     // ¸µ²èÁü¥µ¥¤¥º¤ò¼èÆÀ
-    $src_path = $objUpFile->temp_dir . $objUpFile->temp_file[$arrImageKey[$from_key]];
-    list($src_w, $src_h) = getimagesize($src_path); 
+    $from_path = $objUpFile->temp_dir . $objUpFile->temp_file[$arrImageKey[$from_key]];
+    list($from_w, $from_h) = getimagesize($from_path);
+    
+    // À¸À®Àè¤Î²èÁü¥µ¥¤¥º¤ò¼èÆÀ
+    $to_w = $objUpFile->width[$arrImageKey[$to_key]];
+    $to_h = $objUpFile->height[$arrImageKey[$to_key]];
     
     if($objUpFile->temp_file[$arrImageKey[$to_key]] == ""){
         // ¸µ²èÁü¤Î¤Û¤¦¤¬Â礭¤¤¾ì¹ç¤Ë¤Ï½Ì¾®Î¨ÀßÄê
-        if(NORMAL_IMAGE_WIDTH < $src_w and NORMAL_IMAGE_HEIGHT < $src_h){
-            ($src_w > $src_h) ? $scale = NORMAL_IMAGE_WIDTH / $src_w : $scale = NORMAL_IMAGE_HEIGHT / $src_h;
+        if($to_w < $from_w and $to_h < $from_h){
+            ($from_w > $from_h) ? $scale = $to_w / $from_w : $scale = $to_h / $from_h;
         }else{
             $scale = 1;