Changeset 25793 for trunk/i.php
- Timestamp:
- Dec 5, 2013, 9:53:18 PM (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/i.php
r25385 r25793 285 285 { 286 286 global $page; 287 $original_size = null;288 if (isset($page['original_size']))289 { 290 291 292 293 294 295 296 297 }287 if (!isset($page['original_size'])) 288 return false; 289 290 $original_size = $page['original_size']; 291 if ($page['rotation_angle']==90 || $page['rotation_angle']==270) 292 { 293 $tmp = $original_size[0]; 294 $original_size[0] = $original_size[1]; 295 $original_size[1] = $tmp; 296 } 297 $dsize = $params->compute_final_size($original_size); 298 298 299 299 $use_watermark = $params->use_watermark; 300 300 if ($use_watermark) 301 301 { 302 if (!isset($original_size))303 return false; // cannot really know if a watermark is required304 $dsize = $params->compute_final_size($original_size);305 302 $use_watermark = $params->will_watermark($dsize); 306 303 } … … 315 312 if ($candidate->max_width() < $params->max_width() || $candidate->max_height() < $params->max_height()) 316 313 continue; 314 $candidate_size = $candidate->compute_final_size($original_size); 315 if ($dsize != $params->compute_final_size($candidate_size)) 316 continue; 317 317 318 if ($params->sizing->max_crop==0) 318 319 { … … 324 325 if ($candidate->sizing->max_crop!=0) 325 326 continue; // this could be optimized 326 if (!isset($original_size))327 continue;328 $candidate_size = $candidate->compute_final_size($original_size);329 327 if ($candidate_size[0] < $params->sizing->min_size[0] || $candidate_size[1] < $params->sizing->min_size[1] ) 330 328 continue;
Note: See TracChangeset
for help on using the changeset viewer.