Update app.py

app.py

@@ -307,11 +307,6 @@ def merge_images_in_2_folder(folder1, folder2, outdir, suffix_need_remove = None
             result = merge_2_images(img1, img2, mode, erosion_para, dilate)
             cv2.imwrite(os.path.join(outdir, filename + extensions_folder1[index]), result)
 
-def process_line(img_path = './input', outdir = './output'):
-    depth_anything(img_path, os.path.join(outdir,"depth_anything"))
-    teed_imgs(img_path, os.path.join(outdir,"teed_imgs"), [1,7,2])
-    teed_imgs(os.path.join(outdir,"depth_anything"), os.path.join(outdir,"dp_teed_imgs"), [0,7,2])
-    merge_images_in_2_folder(os.path.join(outdir,"teed_imgs"), os.path.join(outdir,"dp_teed_imgs"), os.path.join(outdir,"merged_imgs"),'_depth', 1, 'multiply', [[2,0],[2,1]],[1,0])
 
 def invert_image(image):
     # 将图片从BGR转为灰度图
@@ -350,28 +345,28 @@ def process_images(input_folder='./output/merged_imgs'):
 def process_line(img, outdir='./output'):
     img_path = "./input"
     
-    # 保存上传的图像
-    cv2.imwrite(os.path.join(img_path, "input_image.png"), img)  
-    
-    # 确保输出目录存在
-    os.makedirs(outdir, exist_ok=True)
-
-    try:
-        depth_anything(img_path, os.path.join(outdir, "depth_anything"))
-        teed_imgs(img_path, os.path.join(outdir, "teed_imgs"), [1, 7, 2])
-        teed_imgs(os.path.join(outdir, "depth_anything"), os.path.join(outdir, "dp_teed_imgs"), [0, 7, 2])
-        merge_images_in_2_folder(os.path.join(outdir, "teed_imgs"), 
-                                  os.path.join(outdir, "dp_teed_imgs"), 
-                                  os.path.join(outdir, "merged_imgs"), 
-                                  '_depth', 1, 'multiply', [[2, 0], [2, 1]], [1, 0])
+    # 确保 img 是一个有效的 NumPy 数组
+    if isinstance(img, np.ndarray):
+        print(f"Image type: {type(img)}, shape: {img.shape}, dtype: {img.dtype}")
         
-        # 返回处理后的最后一张图像
-        result_img_path = os.path.join(outdir, "merged_imgs", "your_final_image_name.png")  # 修改为你的输出图像路径
-        return Image.open(result_img_path)
+        # 确保图像是 uint8 类型
+        img = img.astype(np.uint8)
+        
+        # 保存上传的图像
+        cv2.imwrite(os.path.join(img_path, "input_image.png"), img)
+    else:
+        raise ValueError("Input img is not a valid NumPy array")
+
+    # 继续处理
+    depth_anything(img_path, os.path.join(outdir, "depth_anything"))
+    teed_imgs(img_path, os.path.join(outdir, "teed_imgs"), [1, 7, 2])
+    teed_imgs(os.path.join(outdir, "depth_anything"), os.path.join(outdir, "dp_teed_imgs"), [0, 7, 2])
+    merge_images_in_2_folder(os.path.join(outdir, "teed_imgs"), os.path.join(outdir, "dp_teed_imgs"), os.path.join(outdir, "merged_imgs"), '_depth', 1, 'multiply', [[2, 0], [2, 1]], [1, 0])
+    
+    # 返回处理后的最后一张图像
+    result_img_path = os.path.join(outdir, "merged_imgs", "your_final_image_name.png")  # 修改为你的输出图像路径
+    return Image.open(result_img_path)
 
-    except Exception as e:
-        print(f"Error processing the image: {e}")
-        return None
 
 
 if __name__ == '__main__':