From 431db6e3f865e272bf0b347a81b8b66c9b29edc5 Mon Sep 17 00:00:00 2001 From: Sean Sube Date: Sat, 18 Feb 2023 05:47:34 -0600 Subject: [PATCH] repack size into tuples --- api/onnx_web/image.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/api/onnx_web/image.py b/api/onnx_web/image.py index fcccfd9a..be7153ea 100644 --- a/api/onnx_web/image.py +++ b/api/onnx_web/image.py @@ -1,9 +1,9 @@ import numpy as np from numpy import random from PIL import Image, ImageChops, ImageFilter, ImageOps -from typing import Tuple +from typing import Tuple, Union -from .params import Border, Point +from .params import Border, Point, Size def get_pixel_index(x: int, y: int, width: int) -> int: @@ -194,17 +194,17 @@ def expand_image( def valid_image( image: Image.Image, - min_dims: Tuple[int, int] = [512, 512], - max_dims: Tuple[int, int] = [512, 512], + min_dims: Union[Size, Tuple[int, int]] = [512, 512], + max_dims: Union[Size, Tuple[int, int]] = [512, 512], ) -> Image.Image: min_x, min_y = min_dims max_x, max_y = max_dims if image.width > max_x or image.height > max_y: - image = ImageOps.contain(image, max_dims) + image = ImageOps.contain(image, (max_x, max_y)) if image.width < min_x or image.height < min_y: - blank = Image.new(image.mode, min_dims, "black") + blank = Image.new(image.mode, (min_x, min_y), "black") blank.paste(image) image = blank