~maj v3.0.19-->v3.0.21

[ptitvelo/web/www.git] / www / ecrire / inc / filtres_images_lib_mini.php

diff --git a/www/ecrire/inc/filtres_images_lib_mini.php b/www/ecrire/inc/filtres_images_lib_mini.php
index a30535e..83c5429 100644 (file)
--- a/www/ecrire/inc/filtres_images_lib_mini.php
+++ b/www/ecrire/inc/filtres_images_lib_mini.php
@@ -145,6 +145,11 @@ function _image_valeurs_trans($img, $effet, $forcer_format = false, $fonction_cr
        }       else {
                // enlever le timestamp eventuel
                $source=preg_replace(',[?][0-9]+$,','',$source);
+               if (strpos($source,"?")!==false
+                       AND strncmp($source,_DIR_IMG,strlen(_DIR_IMG))==0
+                       AND file_exists($f=preg_replace(',[?].*$,','',$source))){
+                       $source = $f;
+               }
                $fichier = $source;
        }
 
@@ -750,10 +755,14 @@ function _image_creer_vignette($valeurs, $maxWidth, $maxHeight, $process='AUTO',
                else
                // imagick (php4-imagemagick)
                if ($process == 'imagick') {
+
                        $vignette = "$destination.".$format_sortie;
-                       $handle = imagick_readimage($image);
-                       imagick_resize($handle, $destWidth, $destHeight, IMAGICK_FILTER_LANCZOS, _IMG_IMAGICK_QUALITE / 100);
-                       imagick_write($handle, $vignette);
+
+                       $imagick = new Imagick();
+                       $imagick->readImage($image);
+                       $imagick->resizeImage($destWidth, $destHeight, Imagick::FILTER_LANCZOS, 1 );//, IMAGICK_FILTER_LANCZOS, _IMG_IMAGICK_QUALITE / 100);
+                       $imagick->writeImage($vignette);
+
                        if (!@file_exists($vignette)) {
                                spip_log("echec imagick sur $vignette");
                                return;