From d428eb6f9215dcbdb166750cda93a8114340b1b1 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Sat, 11 Aug 2007 10:28:22 +0000
Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=8D=B8?=
 =?UTF-8?q?=EB=84=A4=EC=9D=BC=20=EC=83=9D=EC=84=B1=EC=8B=9C=20=EC=BD=94?=
 =?UTF-8?q?=EB=93=9C=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95=20(?=
 =?UTF-8?q?=EA=B0=99=EC=9D=80=20=ED=81=AC=EA=B8=B0=EB=A1=9C=20=EB=A6=AC?=
 =?UTF-8?q?=EC=82=AC=EC=9D=B4=EC=A6=88=EC=8B=9C=20=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=EB=B0=9C=EC=83=9D)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://xe-core.googlecode.com/svn/trunk@2313 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 classes/file/FileHandler.class.php   | 4 ++--
 modules/member/member.controller.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/classes/file/FileHandler.class.php b/classes/file/FileHandler.class.php
index e7e79de09..5ab8262ad 100644
--- a/classes/file/FileHandler.class.php
+++ b/classes/file/FileHandler.class.php
@@ -208,8 +208,8 @@
             @imagefilledrectangle($thumb,0,0,$resize_width-1,$resize_height-1,$white);
 
             // 이미지 정보가 정해진 크기보다 크면 크기를 바꿈 (%를 구해서 처리)
-            if($resize_width>0 && $width > $resize_width) $width_per = $resize_width / $width;
-            if($resize_height>0 && $height > $resize_height) $height_per = $resize_height / $height;
+            if($resize_width>0 && $width >= $resize_width) $width_per = $resize_width / $width;
+            if($resize_height>0 && $height >= $resize_height) $height_per = $resize_height / $height;
             if($width_per < $height_per) $per = $height_per;
             else $per = $width_per;
 
diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index 6b664a695..eda1be4e3 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -738,7 +738,7 @@
             $target_filename = sprintf('%s%d.gif', $target_path, $member_srl);
 
             // 파일 정보 구함
-            list($width, $height, $type, $attrs) = @getimagesize($source_file);
+            list($width, $height, $type, $attrs) = @getimagesize($target_file);
 
             // 지정된 사이즈보다 크거나 gif가 아니면 변환
             if($width > $max_width || $height > $max_height || $type!=1) FileHandler::createImageFile($target_file, $target_filename, $max_width, $max_height, 'gif');