Changeset 6928

Timestamp:

May 2, 2008, 7:44:38 AM (14 years ago)

Author:

ebihara

Message:

getOutputFormat()はjpegなどの揺れた値を返さないので、冗長な判定文を削除。加えて、getOutputFormat()が想定外の値をより返しにくくした。

File:

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

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

@@ -136 +136 @@
         touch($this->cache_fullpath);
         switch ($this->getOutputFormat()) {
-        case 'jpeg':
         case 'jpg':
-        default:
-            imagejpeg($output_gdimg, $this->cache_fullpath, $this->jpeg_quality); break;
+            imagejpeg($output_gdimg, $this->cache_fullpath, $this->jpeg_quality);
+            break;
         case 'gif':
             imagegif($output_gdimg, $this->cache_fullpath);
@@ -194 +193 @@
     {
         if ($output_format) {
-            $this->output_format = $this->checkFormatString($output_format);
+            $this->output_format = $output_format;
         } else {
-            $this->output_format = $this->checkFormatString($this->getSourceFormat());
+            $this->output_format = $this->getSourceFormat();
         }
     }
@@ -224 +223 @@
     function getOutputFormat()
     {
-        return $this->output_format;
+        return $this->checkFormatString($this->output_format);
     }