diff --git a/inc/odt2spip_generer_sortie.php b/inc/odt2spip_generer_sortie.php index 003b3dfaad2aed27c2559882be3b5d43a1397b6b..d0a0b1eb6a6903c3529cbec7c941b8b948bea296 100644 --- a/inc/odt2spip_generer_sortie.php +++ b/inc/odt2spip_generer_sortie.php @@ -159,8 +159,8 @@ function inc_odt2spip_generer_sortie($rep_dezip, $fichier_source = '') { $Tarticle['texte'] = str_replace($ch, '', $Tarticle['texte']); } elseif (file_exists($rep_pictures . $img)) { // retailler l'image en fct des parametres ;;;largeur;;;hauteur;;; - $largeur = round($Tdims[1] * $conversion_image); - $hauteur = round($Tdims[2] * $conversion_image); + $largeur = round(floatval($Tdims[1]) * $conversion_image); + $hauteur = round(floatval($Tdims[2]) * $conversion_image); $odt2spip_retailler_img($rep_pictures . $img, $largeur, $hauteur); $id_document = $ajouter_documents( 'new', diff --git a/inc/odt2spip_retailler_img.php b/inc/odt2spip_retailler_img.php index 6c18aea756197777dbfc282d4ee006c3b24902a0..5c7086a72d8bbd57643dc7057159777631da635e 100644 --- a/inc/odt2spip_retailler_img.php +++ b/inc/odt2spip_retailler_img.php @@ -53,7 +53,11 @@ function inc_odt2spip_retailler_img($img_ini, $l = 0, $h = 400) { // calculer le ratio a appliquer aux dimensions initiales $l_ini = $param_img[0]; $h_ini = $param_img[1]; - $ratio = ($l != 0 ? (abs($l_ini - $l) >= abs($h_ini - $h) ? $l / $l_ini : $h / $h_ini) : $h / $h_ini); + if ($l == 0 and $h == 0) { + $ratio = 1; + } else { + $ratio = ($l != 0 ? (abs($l_ini - $l) >= abs($h_ini - $h) ? $l / $l_ini : $h / $h_ini) : $h / $h_ini); + } $img_nv = imagecreatetruecolor($l_ini * $ratio, $h_ini * $ratio); $img_acopier = $fct_creation_ext($img_ini); diff --git a/paquet.xml b/paquet.xml index ba9e4bbfa9becad54b9e9094728d612d7e2dfcf9..4507b137cd8aaadc013dd603cd0f4836c3e6fd11 100644 --- a/paquet.xml +++ b/paquet.xml @@ -1,9 +1,9 @@ <paquet prefix="odt2spip" categorie="edition" - version="3.0.0-alpha1" + version="3.0.0" schema="201406091738" - etat="dev" + etat="test" compatibilite="[3.1.0;3.2.*]" logo="odt2spip-64.png" documentation="https://contrib.spip.net/3001"