Changeset 9283 for temp/trunk/data

Timestamp:

2006/11/28 11:05:08 (20 years ago)

Author:

kakinaka

Message:

blank

Location:

temp/trunk/data

Files:

• class/SC_Image.php (modified) (1 diff)
• lib/gdthumb.php (modified) (6 diffs)

temp/trunk/data/class/SC_Image.php

@@ -81 +81 @@
         // °ì°Õ¤ÊID¤ò¼èÆÀ¤¹¤ë¡£
         $uniqname = date("mdHi") . "_" . uniqid("");
-        
+
         // ¥Õ¥¡¥¤¥ë̾¡¢ÊݸÀèÀßÄê
         $filename = $uniqname . "." . $extension;

temp/trunk/data/lib/gdthumb.php

@@ -72 +72 @@
     * integer $height
     */
-    function Main($path, $width, $height, $dst_file) {
+    function Main($path, $width, $height, $dst_file, $header = false) {
         
         if(!isset($path)) {
@@ -126 +126 @@
                     $dst_im = $imagecreate($re_size[0], $re_size[1]);
                     
-//                  $transparent = imagecolortransparent($src_im);
-//                  $colorstotal = imagecolorstotal ($src_im);
+                    $transparent = imagecolortransparent($src_im);
+                    $colorstotal = imagecolorstotal ($src_im);
                     
                     $dst_im = imagecreate($re_size[0], $re_size[1]);
@@ -138 +138 @@
 
                     if(function_exists("imagegif")) {
-                        $dst_file = $dst_file . ".gif";
-                        imagegif($dst_im, $dst_file);
+                        
+                        // ²èÁü½ÐÎÏ
+                        if($header){
+                            header("Content-Type: image/gif");
+                            imagegif($dst_im);
+                            return "";
+                        }else{
+                            $dst_file = $dst_file . ".gif";
+                            imagegif($dst_im, $dst_file);
+                        }
+                        
                         imagedestroy($src_im);
                         imagedestroy($dst_im);
                     } else {
-                        $dst_file = $dst_file . ".png";                     
-                        imagepng($dst_im, $dst_file);
+                        // ²èÁü½ÐÎÏ
+                        if($header){
+                            header("Content-Type: image/png");
+                            imagepng($dst_im);
+                            return "";
+                        }else{
+                            $dst_file = $dst_file . ".png";                     
+                            imagepng($dst_im, $dst_file);
+                        }
                         imagedestroy($src_im);
                         imagedestroy($dst_im);
@@ -159 +175 @@
                     imagestring($dst_im, 5, 10, 10, "GIF $size[0]x$size[1]", $red);
                     imageRectangle ($dst_im, 0, 0, ($re_size[0]-1), ($re_size[1]-1), $black);
-                    $dst_file = $dst_file . ".png";
-                    imagepng($dst_im, $dst_file);
+                    
+                    // ²èÁü½ÐÎÏ
+                    if($header){
+                        header("Content-Type: image/png");
+                        imagepng($dst_im);
+                        return "";
+                    }else{
+                        $dst_file = $dst_file . ".png";
+                        imagepng($dst_im, $dst_file);
+                    }
                     imagedestroy($src_im);
                     imagedestroy($dst_im);
@@ -173 +197 @@
                 $imageresize( $dst_im, $src_im, 0, 0, 0, 0, $re_size[0], $re_size[1], $size[0], $size[1]);
                 
-                $dst_file = $dst_file . ".jpg";
-                imageJpeg($dst_im, $dst_file);
+                // ²èÁü½ÐÎÏ
+                if($header){
+                    header("Content-Type: image/jpeg");
+                    imageJpeg($dst_im);
+                    return "";
+                }else{
+                    $dst_file = $dst_file . ".jpg";
+                    imageJpeg($dst_im, $dst_file);
+                }
+                
                 imagedestroy($src_im);
                 imagedestroy($dst_im);
@@ -196 +228 @@
                     imagecopyresized($dst_im,$src_im, 0, 0, 0, 0, $re_size[0], $re_size[1], $size[0], $size[1]);
                     imagetruecolortopalette($dst_im, false, imagecolorstotal($src_im));
-                }               
-            
-                $dst_file = $dst_file . ".png";
-                imagepng($dst_im, $dst_file);
+                }
+                
+                // ²èÁü½ÐÎÏ
+                if($header){
+                    header("Content-Type: image/png");
+                    imagepng($dst_im);
+                    return "";
+                }else{
+                    $dst_file = $dst_file . ".png";
+                    imagepng($dst_im, $dst_file);
+                }
                 imagedestroy($src_im);
                 imagedestroy($dst_im);