hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 15:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update stamper / watermarker

Browse Source
This commit is contained in:
Romain Neutron
2012-09-21 15:03:21 +02:00
parent 99e888c7e8
commit 5bd18f61e4
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/classes/recordutils/image.class.php
View File

@@ -9,6 +9,8 @@
* file that was distributed with this source code.
*/
use Alchemy\Phrasea\Application;
/**
*
*
@@ -69,10 +71,9 @@ class recordutils_image extends recordutils
* @param boolean $hd
* @return string
*/
public static function stamp(\media_subdef $subdef)
public static function stamp(Application $app, \media_subdef $subdef)
{
$appbox = appbox::get_instance(\bootstrap::getCore());
$registry = $appbox->get_registry();
$registry = $app['phraseanet.registry'];
$base_id = $subdef->get_record()->get_base_id();
if ($subdef->get_type() !== \media_subdef::TYPE_IMAGE) {
@@ -310,10 +311,9 @@ class recordutils_image extends recordutils
* @param \media_subdef $subdef
* @return boolean|string
*/
public static function watermark(\media_subdef $subdef)
public static function watermark(Application $app, \media_subdef $subdef)
{
$appbox = appbox::get_instance(\bootstrap::getCore());
$registry = $appbox->get_registry();
$registry = $app['phraseanet.registry'];
$base_id = $subdef->get_record()->get_base_id();
if ($subdef->get_name() !== 'preview') {
@@ -365,7 +365,7 @@ class recordutils_image extends recordutils
$return_value = proc_close($process);
}
} elseif ($registry->get('GV_imagick')) {
$collname = phrasea::bas_names($base_id);
$collname = phrasea::bas_names($base_id, $app);
$cmd = $registry->get('GV_imagick');
$tailleimg = @getimagesize($pathIn);
$max = ($tailleimg[0] > $tailleimg[1] ? $tailleimg[0] : $tailleimg[1]);