repack size into tuples
This commit is contained in:
parent
3ca02d4875
commit
431db6e3f8
|
@ -1,9 +1,9 @@
|
||||||
import numpy as np
|
import numpy as np
|
||||||
from numpy import random
|
from numpy import random
|
||||||
from PIL import Image, ImageChops, ImageFilter, ImageOps
|
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:
|
def get_pixel_index(x: int, y: int, width: int) -> int:
|
||||||
|
@ -194,17 +194,17 @@ def expand_image(
|
||||||
|
|
||||||
def valid_image(
|
def valid_image(
|
||||||
image: Image.Image,
|
image: Image.Image,
|
||||||
min_dims: Tuple[int, int] = [512, 512],
|
min_dims: Union[Size, Tuple[int, int]] = [512, 512],
|
||||||
max_dims: Tuple[int, int] = [512, 512],
|
max_dims: Union[Size, Tuple[int, int]] = [512, 512],
|
||||||
) -> Image.Image:
|
) -> Image.Image:
|
||||||
min_x, min_y = min_dims
|
min_x, min_y = min_dims
|
||||||
max_x, max_y = max_dims
|
max_x, max_y = max_dims
|
||||||
|
|
||||||
if image.width > max_x or image.height > max_y:
|
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:
|
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)
|
blank.paste(image)
|
||||||
image = blank
|
image = blank
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue