Changeset 7656

Timestamp:

Jul 8, 2008, 1:21:20 AM (13 years ago)

Author:

ebihara

Message:

OpenPNE_Img_Cache を作成し、 OpenPNE_Img_Generator::$cache_dir を OpenPNE_Img_Cache::$cache_dir に移動

Location:

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

Files:

• Cache.php (added)
• Generator.php (modified) (6 diffs)
• Generator/ImageMagick.php (modified) (1 diff)

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

@@ -31 +31 @@
     var $height = 0;
 
-
     /**
      * @var string
@@ -44 +43 @@
     var $output_format;
 
-
     /**
      * @var string
      * @access protected
      */
-    var $cache_dir;
-
-    /**
-     * @var string
-     * @access protected
-     */
     var $cache_fullpath;
 
@@ -67 +59 @@
      */
     var $allowed_size;
+
+    /**
+     * @var OpenPNE_Img_Cache
+     * @access public
+     */
+    var $cache;
 
     /**
@@ -84 +82 @@
         }
 
-        if (!empty($options['cache_dir'])) {
-            $this->cache_dir = $options['cache_dir'];
-        }
+        require_once 'OpenPNE/Img/Cache.php';
+        $this->cache =& new OpenPNE_Img_Cache($options);
     }
 
@@ -109 +106 @@
 
         // キャッシュを生成
-        $this->createCacheSubdir($this->cache_dir);
+        $this->createCacheSubdir($this->cache->getCacheDir());
         if ($output_img) {
             $this->createCache($output_img);
@@ -202 +199 @@
     {
         $path = OpenPNE_Img::get_cache_path($filename, $this->width, $this->height, $this->getOutputFormat());
-        $this->cache_fullpath = $this->cache_dir . '/' . $path;
+        $this->cache_fullpath = $this->cache->getCacheDir() . '/' . $path;
     }
 

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

@@ -44 +44 @@
         $path = sprintf('%s/w_h_raw/%s', $format, $file);
 
-        $this->raw_cache_fullpath = $this->cache_dir . '/' . $path;
+        $this->raw_cache_fullpath = $this->cache->getCacheDir() . '/' . $path;
     }