Changeset 6858

Timestamp:

Apr 30, 2008, 4:13:46 AM (14 years ago)

Author:

ebihara

Message:

OpenPNE_Img::create_cache_from_raw_img() と OpenPNE_Img::create_cache() を削除

File:

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

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

@@ -137 +137 @@
         // サイズ指定がなく、かつ、形式変換しない場合(GDに変換する必要なし)
         if (!$w && !$h && ($this->generator->getSourceFormat() == $this->generator->getOutputFormat())) {
-            $this->create_cache_from_raw_img();
+            $this->generator->createCacheFromRawImage($this->cache_fullpath, $this->cache_dir, $this->raw_img);
             return true;
         }
@@ -156 +156 @@
         //キャッシュを生成
         if ($output_img) {
-            $this->create_cache($output_img);
+            $this->generator->createCache($this->cache_fullpath, $this->cache_dir, $output_img);
         } else {
-            $this->create_cache_from_raw_img();
+            $this->generator->createCacheFromRawImage($this->cache_fullpath, $this->cache_dir, $this->raw_img);
         }
 
@@ -252 +252 @@
 
     /**
-     * キャッシュを作成する
-     *
-     * @access protected
-     */
-    function create_cache($output_gdimg)
-    {
-        $this->generator->createCache($this->cache_fullpath, $this->cache_dir, $output_gdimg);
-    }
-
-    /**
-     * @access protected
-     */
-    function create_cache_from_raw_img()
-    {
-        $this->generator->createCacheFromRawImage($this->cache_fullpath, $this->cache_dir, $this->raw_img);
-    }
-
-    /**
      * ソースファイル名(拡張子からフォーマットも)設定
      * @access protected