Upload app.py

app.py

@@ -57,19 +57,33 @@ def concatenate_images(images, direction="horizontal", spacing=0, background_col
     if not valid_images:
         return None
     
-    if len(valid_images) == 1:
-        return valid_images[0]
+    # 確保所有圖片都轉換為RGB模式（去除透明通道）
+    rgb_images = []
+    for img in valid_images:
+        if img.mode != 'RGB':
+            # 如果有透明通道，先貼到白色背景上
+            if img.mode in ('RGBA', 'LA'):
+                background = Image.new('RGB', img.size, 'white')
+                background.paste(img, mask=img.split()[-1] if img.mode == 'RGBA' else None)
+                rgb_images.append(background)
+            else:
+                rgb_images.append(img.convert('RGB'))
+        else:
+            rgb_images.append(img)
+    
+    if len(rgb_images) == 1:
+        return rgb_images[0]
     
     if direction == "horizontal":
         # 水平拼接
-        total_width = sum(img.size[0] for img in valid_images) + spacing * (len(valid_images) - 1)
-        max_height = max(img.size[1] for img in valid_images)
+        total_width = sum(img.size[0] for img in rgb_images) + spacing * (len(rgb_images) - 1)
+        max_height = max(img.size[1] for img in rgb_images)
         
-        # 創建新圖片
+        # 創建新圖片 - 確保為RGB模式
         result = Image.new('RGB', (total_width, max_height), background_color)
         
         x_offset = 0
-        for img in valid_images:
+        for img in rgb_images:
             # 垂直居中放置
             y_offset = (max_height - img.size[1]) // 2
             result.paste(img, (x_offset, y_offset))
@@ -77,14 +91,14 @@ def concatenate_images(images, direction="horizontal", spacing=0, background_col
             
     else:  # vertical
         # 垂直拼接
-        max_width = max(img.size[0] for img in valid_images)
-        total_height = sum(img.size[1] for img in valid_images) + spacing * (len(valid_images) - 1)
+        max_width = max(img.size[0] for img in rgb_images)
+        total_height = sum(img.size[1] for img in rgb_images) + spacing * (len(rgb_images) - 1)
         
-        # 創建新圖片
+        # 創建新圖片 - 確保為RGB模式
         result = Image.new('RGB', (max_width, total_height), background_color)
         
         y_offset = 0
-        for img in valid_images:
+        for img in rgb_images:
             # 水平居中放置
             x_offset = (max_width - img.size[0]) // 2
             result.paste(img, (x_offset, y_offset))
@@ -92,8 +106,33 @@ def concatenate_images(images, direction="horizontal", spacing=0, background_col
     
     return result
 
-def process_images(image1, image2, image3, image4, image5, image6, 
-                  resize_mode, concat_direction, spacing, bg_color):
+def save_as_jpg(image, quality=95):
+    """
+    將圖片保存為高質量JPG格式
+    """
+    if image is None:
+        return None
+    
+    # 確保圖片為RGB模式
+    if image.mode != 'RGB':
+        if image.mode in ('RGBA', 'LA'):
+            # 有透明通道的圖片，貼到白色背景上
+            background = Image.new('RGB', image.size, 'white')
+            if image.mode == 'RGBA':
+                background.paste(image, mask=image.split()[-1])
+            else:
+                background.paste(image, mask=image.split()[-1])
+            image = background
+        else:
+            image = image.convert('RGB')
+    
+    # 保存到bytes buffer
+    buffer = io.BytesIO()
+    image.save(buffer, format='JPEG', quality=quality, optimize=True)
+    buffer.seek(0)
+    
+    # 重新加載為PIL圖片
+    return Image.open(buffer)
     """
     處理圖片拼接的主函數
     """