aboutsummaryrefslogtreecommitdiff
path: root/lib/resize.php
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2012-07-29 04:49:57 +0200
committerSem <sembrestels@riseup.net>2012-07-29 04:49:57 +0200
commitf900e1e3cd0384aade0594ceffb6e4f51ce71415 (patch)
tree058fb6fd76c0aa865f1d08013c196b693cc205ba /lib/resize.php
parente4c742e5ce21ae857ad28e0ec24fbe6e267adfaa (diff)
parent3cc5e98299630bf2acae83ec964343309d16392e (diff)
downloadelgg-f900e1e3cd0384aade0594ceffb6e4f51ce71415.tar.gz
elgg-f900e1e3cd0384aade0594ceffb6e4f51ce71415.tar.bz2
Merge branch 'no-watermark' of git://github.com/sembrestels/Tidypics
Diffstat (limited to 'lib/resize.php')
-rw-r--r--lib/resize.php17
1 files changed, 1 insertions, 16 deletions
diff --git a/lib/resize.php b/lib/resize.php
index b06f317ca..380e0c406 100644
--- a/lib/resize.php
+++ b/lib/resize.php
@@ -5,8 +5,6 @@
* @package TidypicsImageResize
*/
-include dirname(__FILE__) . "/watermark.php";
-
/**
* Create thumbnails using PHP GD Library
@@ -37,7 +35,6 @@ function tp_create_gd_thumbnails($file, $prefix, $filestorename) {
$thumbname = $thumb->getFilenameOnFilestore();
$rtn_code = tp_gd_resize( $file->getFilenameOnFilestore(),
$thumbname,
- FALSE,
$image_sizes['tiny_image_width'],
$image_sizes['tiny_image_height'],
TRUE);
@@ -53,7 +50,6 @@ function tp_create_gd_thumbnails($file, $prefix, $filestorename) {
$thumbname = $thumb->getFilenameOnFilestore();
$rtn_code = tp_gd_resize( $file->getFilenameOnFilestore(),
$thumbname,
- FALSE,
$image_sizes['small_image_width'],
$image_sizes['small_image_height'],
TRUE);
@@ -68,7 +64,6 @@ function tp_create_gd_thumbnails($file, $prefix, $filestorename) {
$thumbname = $thumb->getFilenameOnFilestore();
$rtn_code = tp_gd_resize( $file->getFilenameOnFilestore(),
$thumbname,
- TRUE,
$image_sizes['large_image_width'],
$image_sizes['large_image_height'],
FALSE);
@@ -89,13 +84,12 @@ function tp_create_gd_thumbnails($file, $prefix, $filestorename) {
*
* @param string $input_name The name of the file on the disk
* @param string $output_name The name of the file to be written
- * @param bool - watermark this image?
* @param int $maxwidth The maximum width of the resized image
* @param int $maxheight The maximum height of the resized image
* @param TRUE|FALSE $square If set to TRUE, will take the smallest of maxwidth and maxheight and use it to set the dimensions on all size; the image will be cropped.
* @return bool TRUE on success or FALSE on failure
*/
-function tp_gd_resize($input_name, $output_name, $watermark, $maxwidth, $maxheight, $square = FALSE, $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0) {
+function tp_gd_resize($input_name, $output_name, $maxwidth, $maxheight, $square = FALSE, $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0) {
// Get the size information from the image
$imgsizearray = getimagesize($input_name);
@@ -159,10 +153,6 @@ function tp_gd_resize($input_name, $output_name, $watermark, $maxwidth, $maxheig
return $rtn_code;
}
- if ($watermark) {
- tp_gd_watermark($newimage);
- }
-
switch ($imgsizearray['mime']) {
case 'image/jpeg':
case 'image/pjpeg':
@@ -243,8 +233,6 @@ function tp_create_imagick_thumbnails($file, $prefix, $filestorename) {
}
$file->largethumb = $prefix."largethumb".$filestorename;
- tp_imagick_watermark($thumbname);
-
unset($thumb);
return TRUE;
@@ -370,9 +358,6 @@ function tp_create_im_cmdline_thumbnails($file, $prefix, $filestorename) {
}
$file->largethumb = $prefix."largethumb".$filestorename;
-
- tp_im_cmdline_watermark($thumbname);
-
unset($thumb);
return TRUE;