WebSVN – eFlore/Applications.cel – Diff – //trunk/jrest/bibliotheque/ImageRecreation.php

 	public function obtenirImageEtInfosPourChemin($chemin_fichier) {
 		$image_et_infos = false;
 		if (file_exists($chemin_fichier)) {
 			$image_et_infos = array();
-			list($image_et_infos['largeur'], $image_et_infos['hauteur']) = getimagesize($chemin_fichier);
+			list($image_et_infos['largeur'], $image_et_infos['hauteur'], $image_et_infos['imagetype']) = getimagesize($chemin_fichier);
-			$image_et_infos['poids_octets'] = filesize($chemin_fichier);
-			// @TODO Se protéger contre les images vides, non-JPEG, ou invalides / incomplètes
-			$image_et_infos['image'] = imagecreatefromjpeg($chemin_fichier);
+			$image_et_infos['poids_octets'] = filesize($chemin_fichier);
-			$image_et_infos['chemin'] = $chemin_fichier;
+			$image_et_infos['chemin'] = $chemin_fichier;
+			switch (image_type_to_mime_type($image_et_infos['imagetype'])) {
+				case 'image/jpeg':
+					$image_et_infos['image'] = imagecreatefromjpeg($chemin_fichier);
+					break;
+				case 'image/png':
+					$image_et_infos['image'] = imagecreatefrompng($chemin_fichier);
+					break;
+				default:
+					// ni jpeg ni png donc pas supporté, ça dégage
+					return false;
+			}
+		}
 		return $image_et_infos;
+	}

Subversion Repositories eFlore/Applications.cel