aboutsummaryrefslogtreecommitdiffstats
path: root/include/derivative_params.inc.php
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2012-02-06 20:59:20 +0000
committerrvelices <rv-github@modusoptimus.com>2012-02-06 20:59:20 +0000
commit0d277219fc5fea718d27d80e7ae68b6f4c2f4c4a (patch)
tree0a45bd317b98f2292efe38c8aaf53c163c31e286 /include/derivative_params.inc.php
parent8d86e7b399fbda576306453c332cd9daeb44bdde (diff)
multisize - added the coi (still to affine the admin ui + language)
multisize - derivatives can be revuild from a larger derviative instead of the original git-svn-id: http://piwigo.org/svn/trunk@13038 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/derivative_params.inc.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/derivative_params.inc.php b/include/derivative_params.inc.php
index 15c78c9aa..dc19d1df7 100644
--- a/include/derivative_params.inc.php
+++ b/include/derivative_params.inc.php
@@ -45,7 +45,7 @@ function char_to_fraction($c)
function fraction_to_char($f)
{
- return ord('a') + round($f*25);
+ return chr(ord('a') + round($f*25));
}
/** small utility to manipulate a 'rectangle'*/
@@ -257,9 +257,9 @@ final class DerivativeParams
$this->sizing->add_url_tokens($tokens);
}
- function compute_final_size($in_size, $coi)
+ function compute_final_size($in_size)
{
- $this->sizing->compute( $in_size, $coi, $crop_rect, $scale_size );
+ $this->sizing->compute( $in_size, null, $crop_rect, $scale_size );
return $scale_size != null ? $scale_size : $in_size;
}