aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2012-01-05 21:35:25 +0000
committerrvelices <rv-github@modusoptimus.com>2012-01-05 21:35:25 +0000
commite64ab974df242b25ade46d9795294ae859060355 (patch)
tree87c98fb3c4f7e0cd4318744edef74f4507be5482 /include
parent19b58d483bf3c8de06e6b494040cda6ce446bec2 (diff)
feature 2548 multisize - sharpen + watermarks (partially implemented / no test with imagick extension)
git-svn-id: http://piwigo.org/svn/trunk@12851 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/derivative_params.inc.php5
-rw-r--r--include/derivative_std_params.inc.php43
2 files changed, 45 insertions, 3 deletions
diff --git a/include/derivative_params.inc.php b/include/derivative_params.inc.php
index 42bdfb7d5..be28b6589 100644
--- a/include/derivative_params.inc.php
+++ b/include/derivative_params.inc.php
@@ -282,7 +282,10 @@ final class DerivativeParams
{
public $type = IMG_CUSTOM;
public $last_mod_time = 0; // used for non-custom images to regenerate the cached files
+ public $use_watermark = false;
public $sizing;
+ public $sharpen = 0;
+ public $quality = 85;
function __construct($sizing)
{
@@ -291,7 +294,7 @@ final class DerivativeParams
public function __sleep()
{
- return array('last_mod_time', 'sizing');
+ return array('last_mod_time', 'sizing', 'sharpen', 'quality');
}
function add_url_tokens(&$tokens)
diff --git a/include/derivative_std_params.inc.php b/include/derivative_std_params.inc.php
index 41056cadf..9377b4c67 100644
--- a/include/derivative_std_params.inc.php
+++ b/include/derivative_std_params.inc.php
@@ -28,12 +28,24 @@ define('IMG_XLARGE', 'xlarge');
define('IMG_XXLARGE', 'xxlarge');
define('IMG_CUSTOM', 'custom');
+final class WatermarkParams
+{
+ public $file = '';
+ public $min_size = array(500,500);
+ public $xpos = 50;
+ public $ypos = 50;
+ public $xrepeat = 0;
+ public $opacity = 100;
+}
+
+
final class ImageStdParams
{
private static $all_types = array(IMG_SQUARE,IMG_THUMB,IMG_SMALL,IMG_MEDIUM,IMG_LARGE,IMG_XLARGE,IMG_XXLARGE);
private static $all_type_map = array();
private static $type_map = array();
private static $undefined_type_map = array();
+ private static $watermark;
static function get_all_types()
{
@@ -60,6 +72,11 @@ final class ImageStdParams
return self::$all_type_map[$type];
}
+ static function get_watermark()
+ {
+ return self::$watermark;
+ }
+
static function load_from_db()
{
global $conf;
@@ -67,6 +84,8 @@ final class ImageStdParams
if (false!==$arr)
{
self::$type_map = $arr['d'];
+ self::$watermark = @$arr['w'];
+ if (!self::$watermark) self::$watermark = new WatermarkParams();
}
else
{
@@ -82,6 +101,8 @@ final class ImageStdParams
if (false!==$arr)
{
self::$type_map = $arr['d'];
+ self::$watermark = @$arr['w'];
+ if (!self::$watermark) self::$watermark = new WatermarkParams();
}
else
{
@@ -90,21 +111,28 @@ final class ImageStdParams
self::build_maps();
}
+ static function set_watermark($watermark)
+ {
+ self::$watermark = $watermark;
+ }
+
static function set_and_save($map)
{
global $conf;
self::$type_map = $map;
$ser = serialize( array(
- 'd' => self::$type_map
+ 'd' => self::$type_map,
+ 'w' => self::$watermark,
) );
conf_update_param('derivatives', addslashes($ser) );
file_put_contents(PHPWG_ROOT_PATH.$conf['data_location'].'derivatives.dat', $ser);
self::build_maps();
}
- static function make_default()
+ private static function make_default()
{
+ self::$watermark = new WatermarkParams();
self::$type_map[IMG_SQUARE] = new DerivativeParams( SizingParams::square(100,100) );
self::$type_map[IMG_THUMB] = new DerivativeParams( SizingParams::classic(144,144) );
self::$type_map[IMG_SMALL] = new DerivativeParams( SizingParams::classic(240,240) );
@@ -114,11 +142,22 @@ final class ImageStdParams
self::$type_map[IMG_XXLARGE] = new DerivativeParams( SizingParams::classic(1200,900) );
}
+ public static function apply_global($params)
+ {
+ if (!empty(self::$watermark->file) &&
+ (self::$watermark->min_size[0]<=$params->sizing->ideal_size[0]
+ && self::$watermark->min_size[1]<=$params->sizing->ideal_size[1] ) )
+ {
+ $params->use_watermark = true;
+ }
+ }
+
private static function build_maps()
{
foreach (self::$type_map as $type=>$params)
{
$params->type = $type;
+ self::apply_global($params);
}
self::$all_type_map = self::$type_map;