Skip to content

Commit 5b1df56

Browse files
committed
modified the imageresize node.
1 parent c478e21 commit 5b1df56

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

py/nodes.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -904,13 +904,13 @@ def resize(self, pixels, action, smaller_side, larger_side, scale_factor, resize
904904

905905
crop_x, crop_y, pad_x, pad_y = (0.0, 0.0, 0.0, 0.0)
906906
if action == self.ACTION_TYPE_CROP:
907-
target_ratio = self.parse_side_ratio(side_ratio)
907+
target_ratio = target_width / target_height if target_width != 0 and target_height!=0 else self.parse_side_ratio(side_ratio)
908908
if height * target_ratio < width:
909909
crop_x = width - height * target_ratio
910910
else:
911911
crop_y = height - width / target_ratio
912912
elif action == self.ACTION_TYPE_PAD:
913-
target_ratio = self.parse_side_ratio(side_ratio)
913+
target_ratio = target_width / target_height if target_width != 0 and target_height!=0 else self.parse_side_ratio(side_ratio)
914914
if height * target_ratio > width:
915915
pad_x = height * target_ratio - width
916916
else:
@@ -930,10 +930,7 @@ def resize(self, pixels, action, smaller_side, larger_side, scale_factor, resize
930930
if (resize_mode == self.RESIZE_MODE_DOWNSCALE and scale_factor >= 1.0) or (resize_mode == self.RESIZE_MODE_UPSCALE and scale_factor <= 1.0):
931931
scale_factor = 0.0
932932

933-
if target_width != 0 and target_height!=0:
934-
pixels, mask = self.interpolate_to_target_size(pixels, mask, target_height, target_width)
935-
crop_x, crop_y, pad_x, pad_y = (0.0, 0.0, 0.0, 0.0)
936-
elif scale_factor > 0.0:
933+
if scale_factor > 0.0:
937934
pixels = torch.nn.functional.interpolate(
938935
pixels.movedim(-1, 1), scale_factor=scale_factor, mode="bicubic", antialias=True).movedim(1, -1).clamp(0.0, 1.0)
939936
mask = torch.nn.functional.interpolate(mask.unsqueeze(
@@ -993,6 +990,10 @@ def resize(self, pixels, action, smaller_side, larger_side, scale_factor, resize
993990
for k in range(width):
994991
mask[i, height + add_y[0] - j - 1, k] = max(
995992
mask[i, height + add_y[0] - j - 1, k], feather_strength)
993+
994+
if target_width != 0 and target_height!=0:
995+
pixels, mask = self.interpolate_to_target_size(pixels, mask, target_height, target_width)
996+
996997
if all_szie_8x == "crop":
997998
pixels = self.vae_encode_crop_pixels(pixels)
998999
mask = self.vae_encode_crop_pixels(mask)

0 commit comments

Comments
 (0)