| /branches/v3.01-serpe/jrest/bibliotheque/ImageRecreation.php |
|---|
| 131,7 → 131,7 |
| fclose($fp); |
| $image = file_get_contents($chemin_image); |
| } |
| elseif ('O' === $format) { |
| } elseif ('O' === $format) { |
| $image = new Imagick($chemin_image); |
| $profiles = $image->getImageProfiles('icc', true); |
| $image->stripImage(); |
| /branches/v3.01-serpe/jrest/services/CelImageFormatO.php |
|---|
| 17,7 → 17,7 |
| * @license CECILL v2 <http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt> |
| * @copyright 1999-2014 Tela Botanica <accueil@tela-botanica.org> |
| */ |
| class CelImageFormat { |
| class CelImageFormatO { |
| private $config; |
| // @TODO tirer ça de la config |
| /branches/v3.01-serpe/jrest/services |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/jrest/services:r3914 |
| /branches/v3.01-serpe/jrest |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/jrest:r3913-3914 |
| /branches/v3.01-serpe |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk:r3913-3914 |