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

Merge pull request #685 from romainneutron/icc-profiles

Browse Source 
[3.8] Fix ICC profiles management
This commit is contained in:
Romain Neutron
2013-10-09 04:13:52 -07:00
parent 41306fec74 5996e590bc
commit 044a7d5862
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Alchemy/Phrasea/Border/File.php
View File

@@ -143,6 +143,7 @@ class File
* PHPExiftool throws exception on some files not supported * PHPExiftool throws exception on some files not supported
*/ */
try { try {
$this->app['exiftool.writer']->reset();
$this->app['exiftool.writer']->write($this->getFile()->getRealPath(), $metadatas); $this->app['exiftool.writer']->write($this->getFile()->getRealPath(), $metadatas);
} catch (PHPExiftoolException $e) { } catch (PHPExiftoolException $e) {

3
lib/classes/task/period/writemeta.php
View File

@@ -303,9 +303,10 @@ class task_period_writemeta extends task_databoxAbstract
); );
} }
$this->dependencyContainer['exiftool.writer']->reset();
foreach ($tsub as $name => $file) { foreach ($tsub as $name => $file) {
$this->dependencyContainer['exiftool.writer']->erase($name != 'document' || $this->clear_doc); $this->dependencyContainer['exiftool.writer']->erase($name != 'document' || $this->clear_doc, true);
try { try {
$this->dependencyContainer['exiftool.writer']->write($file, $metadatas); $this->dependencyContainer['exiftool.writer']->write($file, $metadatas);