- Timestamp:
- Apr 30, 2008, 2:52:20 AM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
OpenPNE/branches/work/ebihara/prj_renew_OpenPNE_Img/webapp/lib/OpenPNE/Img.php
r6847 r6848 29 29 30 30 var $source_filename; 31 var $source_format;32 var $output_format;33 31 34 32 var $cache_fullpath; … … 223 221 if ($c_image = $db->get_row($sql, $params)) { 224 222 if ($c_image['type']) { 225 $this->source_format = $c_image['type']; 226 $this->generator->setSourceFormat($this->source_format); 223 $this->generator->setSourceFormat($c_image['type']); 227 224 } 228 225 return base64_decode($c_image['bin']); … … 347 344 348 345 $pieces = explode('.', $this->source_filename); 349 $this->source_format = $this->check_format(array_pop($pieces)); 350 $this->generator->setSourceFormat($this->source_format); 346 $this->generator->setSourceFormat($this->check_format(array_pop($pieces))); 351 347 } 352 348 … … 358 354 if ($this->requests['f']) { 359 355 // リクエストの f(ormat)に従う 360 $ this->output_format = $this->check_format($this->requests['f']);356 $format = $this->check_format($this->requests['f']); 361 357 } else { 362 358 // ソースに従う 363 $ this->output_format = $this->check_format($this->generator->getSourceFormat());364 } 365 $this->generator->setOutputFormat($ this->output_format);359 $format = $this->check_format($this->generator->getSourceFormat()); 360 } 361 $this->generator->setOutputFormat($format); 366 362 } 367 363
Note: See TracChangeset
for help on using the changeset viewer.