Update app.py

app.py

@@ -9,11 +9,21 @@ import time
 # Global variable to store generated GIFs
 generated_gifs = []
 
-def preprocess_image(image):
+def preprocess_image(image_data):
+    # Extract the image and crop data from the ImageEditor output
+    image = image_data["image"].convert('RGBA')
+    crop_data = image_data["crop"]
+
+    if crop_data:
+        # Apply cropping if crop data is available
+        left, top, width, height = crop_data
+        image = image.crop((left, top, left + width, top + height))
+
     # Ensure the image is square by padding it
     size = max(image.size)
     new_image = Image.new("RGBA", (size, size), (255, 255, 255, 0))
     new_image.paste(image, ((size - image.width) // 2, (size - image.height) // 2))
+    
     return new_image
 
 def create_gif(editor1_output, editor2_output, transition_type):
@@ -22,13 +32,9 @@ def create_gif(editor1_output, editor2_output, transition_type):
     total_frames = 18  # Total number of frames
 
     try:
-        # Open images
-        img1 = editor1_output["composite"].convert('RGBA')
-        img2 = editor2_output["composite"].convert('RGBA')
-
-        # Preprocess images to make them square and same size
-        img1 = preprocess_image(img1)
-        img2 = preprocess_image(img2)
+        # Preprocess images
+        img1 = preprocess_image(editor1_output)
+        img2 = preprocess_image(editor2_output)
 
         # Set size for the GIF
         size = (256, 256)
@@ -44,10 +50,10 @@ def create_gif(editor1_output, editor2_output, transition_type):
             for i in range(0, full_width, step):
                 frame = Image.new('RGBA', size)
                 frame.paste(img1, (0, 0))
-                frame.paste(img2.crop((i, 0, full_width, size[1])), (i, 0), mask=img2.crop((i, 0, full_width, size[1])))
+                frame.paste(img2.crop((0, 0, i, size[1])), (full_width - i, 0), mask=img2.crop((0, 0, i, size[1])))
 
                 draw = ImageDraw.Draw(frame)
-                draw.line((i, 0, i, size[1]), fill=(0, 255, 0), width=2)
+                draw.line((full_width - i, 0, full_width - i, size[1]), fill=(0, 255, 0), width=2)
 
                 # Convert frame to P mode which is a palette-based image
                 frame = frame.convert('P', palette=Image.ADAPTIVE)
@@ -56,11 +62,11 @@ def create_gif(editor1_output, editor2_output, transition_type):
             # Generate frames from right to left
             for i in range(full_width, step, -step):
                 frame = Image.new('RGBA', size)
-                frame.paste(img1, (0, 0))
-                frame.paste(img2.crop((i, 0, full_width, size[1])), (i, 0), mask=img2.crop((i, 0, full_width, size[1])))
+                frame.paste(img2, (0, 0))
+                frame.paste(img1.crop((0, 0, i, size[1])), (full_width - i, 0), mask=img1.crop((0, 0, i, size[1])))
 
                 draw = ImageDraw.Draw(frame)
-                draw.line((i, 0, i, size[1]), fill=(0, 255, 0), width=2)
+                draw.line((full_width - i, 0, full_width - i, size[1]), fill=(0, 255, 0), width=2)
 
                 # Convert frame to P mode which is a palette-based image
                 frame = frame.convert('P', palette=Image.ADAPTIVE)