From c2da7fa1c4eb1c1ba898a77665b105637737883d Mon Sep 17 00:00:00 2001
From: "marcimat@rezo.net" <>
Date: Wed, 20 Sep 2017 14:26:12 +0000
Subject: [PATCH] =?UTF-8?q?On=20passe=20en=20test.=20Et=20corrections=20d?=
=?UTF-8?q?=E2=80=99erreurs=20PHP=20lorsque=20le=20document=20contient=20d?=
=?UTF-8?q?es=20images=20dont=20la=20taille=20n=E2=80=99est=20pas=20indiqu?=
=?UTF-8?q?=C3=A9e=20(peut=20=C3=AAtre=20du=20=C3=A0=20la=20conversion=20d?=
=?UTF-8?q?oc=20>=20odt=20et=20la=20version=20de=20libreoffice=20utilis?=
=?UTF-8?q?=C3=A9e=20pour=20le=20faire).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
inc/odt2spip_generer_sortie.php | 4 ++--
inc/odt2spip_retailler_img.php | 6 +++++-
paquet.xml | 4 ++--
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/inc/odt2spip_generer_sortie.php b/inc/odt2spip_generer_sortie.php
index 003b3df..d0a0b1e 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 6c18aea..5c7086a 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 ba9e4bb..4507b13 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"
--
GitLab