Changeset 6846

Timestamp:

Apr 30, 2008, 2:36:27 AM (13 years ago)

Author:

ebihara

Message:

r6884で引き上げたresize_img()メソッドが参照している元クラスのプロパティを新クラスにコピーし、コピーしたプロパティのセッターを追加

Location:

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

Files:

• Img.php (modified) (3 diffs)
• Img/Generator.php (modified) (2 diffs)

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

@@ -224 +224 @@
             if ($c_image['type']) {
                 $this->source_format = $c_image['type'];
+                $this->generator->setSourceFormat($this->source_format);
             }
             return base64_decode($c_image['bin']);
@@ -347 +348 @@
         $pieces = explode('.', $this->source_filename);
         $this->source_format = $this->check_format(array_pop($pieces));
+        $this->generator->setSourceFormat($this->source_format);
     }
 
@@ -361 +363 @@
             $this->output_format = $this->check_format($this->source_format);
         }
+        $this->generator->setOutputFormat($this->output_format);
     }
 

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

@@ -13 +13 @@
 class OpenPNE_Img_Generator
 {
+    var $source_format;
+    var $output_format;
+
     function OpenPNE_Img_Generator()
     {
@@ -91 +94 @@
         return $output_gdimg;
     }
+
+    function setOutputFormat($output_format)
+    {
+        $this->output_format = $output_format;
+    }
+
+    function setSourceFormat($source_format)
+    {
+        $this->source_format = $source_format;
+    }
 }