Changeset 6997

Timestamp:

May 7, 2008, 3:14:32 AM (14 years ago)

Author:

ebihara

Message:

キャッシュの出力先の決定に誤りがあったのを修正
（これでGDに関してはすべてのテストをパスするようになった）

Location:

OpenPNE/branches/work/ebihara/prj_renew_OpenPNE_Img/webapp/lib/OpenPNE

Files:

• Img.php (modified) (2 diffs)
• Img/Generator.php (modified) (4 diffs)
• Img/Generator/GD.php (modified) (2 diffs)

OpenPNE/branches/work/ebihara/prj_renew_OpenPNE_Img/webapp/lib/OpenPNE/Img.php

@@ -64 +64 @@
         $this->generator->setImageSize($width, $height);
 
+        if (!empty($vars['filename'])) {
+            $this->setFilename($vars['filename']);
+        }
+
         if (!empty($vars['f'])) {
             $this->generator->setOutputFormat($vars['f']);
-        }
-
-        if (!empty($vars['filename'])) {
-            $this->setFilename($vars['filename']);
+        } else {
+            $this->generator->setOutputFormat();
         }
     }
@@ -82 +84 @@
         if (!preg_match('/[^\.\w]/', $filename)) {
             $this->filename = $filename;
+
+            $pieces = explode('.', $filename);
+            $this->generator->setSourceFormat($this->generator->checkFormatString(array_pop($pieces)));
         }
     }

OpenPNE/branches/work/ebihara/prj_renew_OpenPNE_Img/webapp/lib/OpenPNE/Img/Generator.php

@@ -18 +18 @@
 
     var $source_format;
-    var $output_format = 'jpg';
+    var $output_format;
 
     var $cache_dir;
@@ -103 +103 @@
     {
         if ($this->getOutputFormat() == 'png') {
-            $this->createCache($raw_img);
+            $gdimg = imagecreatefromstring($raw_img);
+            $this->createCache($gdimg);
         } else {
             $handle = fopen($this->cache_fullpath, 'wb');
@@ -183 +184 @@
     function setCacheFileName($filename)
     {
-        $pieces = explode('.', $filename);
-        $this->setSourceFormat($this->checkFormatString(array_pop($pieces)));
-
         $prefix = OPENPNE_IMG_CACHE_PREFIX;
 
         $format = $this->getOutputFormat();
         $file = $prefix . str_replace('.', '_', $filename) . '.' . $format;
-        $path = sprintf('%s/w%d_h%d/%s', $format, $this->width, $this->height, $file);
+        if ($this->width && $this->height) {
+            $path = sprintf('%s/w%d_h%d/%s', $format, $this->width, $this->height, $file);
+        } else {
+            $path = sprintf('%s/w_h/%s', $format, $file);
+        }
 
         $this->cache_fullpath = $this->cache_dir . '/' . $path;
@@ -243 +245 @@
     function getOutputFormat()
     {
-        return $this->checkFormatString($this->output_format);
+        if ($this->output_format) {
+            return $this->checkFormatString($this->output_format);
+        }
+
+        return $this->getSourceFormat();
     }
 

OpenPNE/branches/work/ebihara/prj_renew_OpenPNE_Img/webapp/lib/OpenPNE/Img/Generator/GD.php

@@ -31 +31 @@
             imageinterlace($source_gdimg, 0);
         }
-/*
-        $s_width  = imagesx($source_gdimg);
-        $s_height = imagesy($source_gdimg);
 
-        $o_width  = $this->width;
-        $o_height = $this->height;
-        if (!$o_width) {
-            $o_width = $s_width;
-        }
-        if (!$o_height) {
-            $o_height = $s_height;
-        }
-
-        $this->calcResizedImageSize($o_width, $o_height, $s_width, $s_height);
-*/
         $s_width  = imagesx($source_gdimg);
         $s_height = imagesy($source_gdimg);
@@ -56 +42 @@
         if (!$h) {
             $h = $s_height;
-        }
-
-        // リサイズの必要がない場合
-        if ($s_width <= $w && $s_height <= $h) {
-            // 形式変換する場合はGDを通す
-            if ($this->source_format != $this->output_format) {
-                return $source_gdimg;
-            }
-            return false;
         }