Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

2 files changed, 14 insertions, 6 deletions

diff --git a/include/attach.php b/include/attach.php
index 0f31ed012..7988286c9 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -1632,16 +1632,17 @@ function find_filename_by_hash($channel_id, $attachHash) {
 }
 
 /**
- * @brief Pipes $in to $out in 16MB chunks.
+ * @brief Pipes $in to $out in 16KB chunks.
  *
  * @param resource $in File pointer of input
  * @param resource $out File pointer of output
+ * @param int $bufsize size of chunk, default 16384
  * @return number with the size
  */
-function pipe_streams($in, $out) {
+function pipe_streams($in, $out, $bufize = 16384) {
 	$size = 0;
 	while (!feof($in))
-		$size += fwrite($out, fread($in, 16384));
+		$size += fwrite($out, fread($in, $bufsize));
 
 	return $size;
 }
diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php
index f75ff2386..6af753195 100644
--- a/include/photo/photo_driver.php
+++ b/include/photo/photo_driver.php
@@ -129,7 +129,14 @@ abstract class photo_driver {
 		return $this->types[$this->getType()];
 	}
 
-	public function scaleImage($max) {
+	/**
+	 * @brief scale image
+	 * int $max maximum pixel size in either dimension
+	 * boolean $float_height - if true allow height to float to any length on tall images, 
+	 *     constraining only the width
+	 */
+
+	public function scaleImage($max, $float_height = true) {
 		if(!$this->is_valid())
 			return FALSE;
 
@@ -146,7 +153,7 @@ abstract class photo_driver {
 			// very tall image (greater than 16:9)
 			// constrain the width - let the height float.
 
-			if((($height * 9) / 16) > $width) {
+			if(((($height * 9) / 16) > $width) && ($float_height)) {
 				$dest_width = $max;
 	 			$dest_height = intval(( $height * $max ) / $width);
 			}
@@ -173,7 +180,7 @@ abstract class photo_driver {
 					// very tall image (greater than 16:9)
 					// but width is OK - don't do anything
 
-					if((($height * 9) / 16) > $width) {
+					if(((($height * 9) / 16) > $width) && ($float_height)) {
 						$dest_width = $width;
 	 					$dest_height = $height;
 					}