Changeset 6848 for OpenPNE/branches/work/ebihara/prj_renew_OpenPNE_Img/webapp/lib/OpenPNE/Img.php

Timestamp:

Apr 30, 2008, 2:52:20 AM (13 years ago)

Author:

ebihara

Message:

元クラスのresize_img()で参照してたプロパティを削除

File:

• OpenPNE/branches/work/ebihara/prj_renew_OpenPNE_Img/webapp/lib/OpenPNE/Img.php (modified) (4 diffs)

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

@@ -29 +29 @@
 
     var $source_filename;
-    var $source_format;
-    var $output_format;
 
     var $cache_fullpath;
@@ -223 +221 @@
         if ($c_image = $db->get_row($sql, $params)) {
             if ($c_image['type']) {
-                $this->source_format = $c_image['type'];
-                $this->generator->setSourceFormat($this->source_format);
+                $this->generator->setSourceFormat($c_image['type']);
             }
             return base64_decode($c_image['bin']);
@@ -347 +344 @@
 
         $pieces = explode('.', $this->source_filename);
-        $this->source_format = $this->check_format(array_pop($pieces));
-        $this->generator->setSourceFormat($this->source_format);
+        $this->generator->setSourceFormat($this->check_format(array_pop($pieces)));
     }
 
@@ -358 +354 @@
         if ($this->requests['f']) {
             // リクエストの f(ormat)に従う
-            $this->output_format = $this->check_format($this->requests['f']);
+            $format = $this->check_format($this->requests['f']);
         } else {
             // ソースに従う
-            $this->output_format = $this->check_format($this->generator->getSourceFormat());
-        }
-        $this->generator->setOutputFormat($this->output_format);
+            $format = $this->check_format($this->generator->getSourceFormat());
+        }
+        $this->generator->setOutputFormat($format);
     }