diff --git a/image_project/init_image/src/fusionner_horizontalement.py b/image_project/init_image/src/fusionner_horizontalement.py index b21d473..db6afd1 100644 --- a/image_project/init_image/src/fusionner_horizontalement.py +++ b/image_project/init_image/src/fusionner_horizontalement.py @@ -1,4 +1,3 @@ -from .resize_image import redimensionner_image from PIL import Image import numpy as np @@ -6,9 +5,9 @@ def fusionner_horizontalement(image1, image2): image2_redimensionnee = image2 if (image1.size[1] != image2.size[1]): - nouvelle_largeur = int(image2.size[0] * (image1.size[1] / image2.size[1])) - nouvelle_hauteur = image1.size[1] - image2_redimensionnee = redimensionner_image(np.asarray(image2), nouvelle_largeur, nouvelle_hauteur) + ratio = image2.height / image2.width + new_width = int(image1.height * ratio) + image2_redimensionnee = image2.resize((new_width, image1.height)) result = Image.new('RGB', (image1.width + image2_redimensionnee.width, image1.height)) result.paste(image1, (0, 0)) diff --git a/image_project/init_image/src/fusionner_verticalement.py b/image_project/init_image/src/fusionner_verticalement.py index 610da00..1a653c6 100644 --- a/image_project/init_image/src/fusionner_verticalement.py +++ b/image_project/init_image/src/fusionner_verticalement.py @@ -1,4 +1,3 @@ -from .resize_image import redimensionner_image from PIL import Image import numpy as np @@ -6,7 +5,10 @@ def fusionner_verticalement(image1, image2): image2_redimensionnee = image2 if (image1.size[0] != image2.size[0]): - image2_redimensionnee = image2_redimensionnee.resize(image1.size) + ratio = image2.width / image2.height + + new_height = int(image1.width / ratio) + image2_redimensionnee = image2.resize((image1.width, new_height)) result = Image.new('RGB', (image1.width, image1.height + image2_redimensionnee.height)) result.paste(image1, (0, 0)) diff --git a/image_project/media/image_align_h_0.png b/image_project/media/image_align_h_0.png index 18fd4b8..61721b6 100644 Binary files a/image_project/media/image_align_h_0.png and b/image_project/media/image_align_h_0.png differ diff --git a/image_project/media/image_align_h_3.png b/image_project/media/image_align_h_3.png index 0361e83..597fbb4 100644 Binary files a/image_project/media/image_align_h_3.png and b/image_project/media/image_align_h_3.png differ diff --git a/image_project/media/image_align_v_2.png b/image_project/media/image_align_v_2.png index 25e34e9..0361e83 100644 Binary files a/image_project/media/image_align_v_2.png and b/image_project/media/image_align_v_2.png differ diff --git a/image_project/media/image_align_v_3.png b/image_project/media/image_align_v_3.png index 6ac7e42..597fbb4 100644 Binary files a/image_project/media/image_align_v_3.png and b/image_project/media/image_align_v_3.png differ diff --git a/image_project/media/image_classique_0.png b/image_project/media/image_classique_0.png index 18fd4b8..a91655d 100644 Binary files a/image_project/media/image_classique_0.png and b/image_project/media/image_classique_0.png differ diff --git a/image_project/media/image_classique_1.png b/image_project/media/image_classique_1.png index 9f8d106..0361e83 100644 Binary files a/image_project/media/image_classique_1.png and b/image_project/media/image_classique_1.png differ diff --git a/image_project/media/image_fusion-horizontal.png b/image_project/media/image_fusion-horizontal.png index 82cf8aa..b4d9fdc 100644 Binary files a/image_project/media/image_fusion-horizontal.png and b/image_project/media/image_fusion-horizontal.png differ diff --git a/image_project/media/image_fusion-vertical.png b/image_project/media/image_fusion-vertical.png index 673c405..3b4d396 100644 Binary files a/image_project/media/image_fusion-vertical.png and b/image_project/media/image_fusion-vertical.png differ diff --git a/image_project/media/new_gif.gif b/image_project/media/new_gif.gif index 47e129c..ab81982 100644 Binary files a/image_project/media/new_gif.gif and b/image_project/media/new_gif.gif differ