summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2013-03-18 11:33:47 -0700
committerAndreas Gohr <andi@splitbrain.org>2013-03-18 11:33:47 -0700
commitfbcd14680c323ee3f63b6139d40cc724718964fd (patch)
tree4c02d49721903a8deb037fc819fdd4bd904f8b6e
parent2f02df4d01bd253574d48fa9273352251dc23ee2 (diff)
parentd02ff93090ec7ab874d4f61fbef15d5b3a2eb341 (diff)
downloadrpg-fbcd14680c323ee3f63b6139d40cc724718964fd.tar.gz
rpg-fbcd14680c323ee3f63b6139d40cc724718964fd.tar.bz2
Merge pull request #200 from splitbrain/fetchissues
correct parenthesis in image crop calculations to ensure integer values
-rw-r--r--inc/media.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/inc/media.php b/inc/media.php
index 501d170f3..2268ad877 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -1831,23 +1831,23 @@ function media_crop_image($file, $ext, $w, $h=0){
if($tr >= 1){
if($tr > $fr){
$cw = $info[0];
- $ch = (int) $info[0]/$tr;
+ $ch = (int) ($info[0]/$tr);
}else{
- $cw = (int) $info[1]*$tr;
+ $cw = (int) ($info[1]*$tr);
$ch = $info[1];
}
}else{
if($tr < $fr){
- $cw = (int) $info[1]*$tr;
+ $cw = (int) ($info[1]*$tr);
$ch = $info[1];
}else{
$cw = $info[0];
- $ch = (int) $info[0]/$tr;
+ $ch = (int) ($info[0]/$tr);
}
}
// calculate crop offset
- $cx = (int) ($info[0]-$cw)/2;
- $cy = (int) ($info[1]-$ch)/3;
+ $cx = (int) (($info[0]-$cw)/2);
+ $cy = (int) (($info[1]-$ch)/3);
//cache
$local = getCacheName($file,'.media.'.$cw.'x'.$ch.'.crop.'.$ext);