From da40b0b461cb7127fe89fb88a2a28378f72c47eb Mon Sep 17 00:00:00 2001 From: lllyasviel Date: Thu, 21 Sep 2023 03:48:09 -0700 Subject: [PATCH] better fomulation (#466) --- fooocus_version.py | 2 +- modules/inpaint_worker.py | 24 ++++++++++++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/fooocus_version.py b/fooocus_version.py index bf1ea811..88584bd0 100644 --- a/fooocus_version.py +++ b/fooocus_version.py @@ -1 +1 @@ -version = '2.0.77' +version = '2.0.78' diff --git a/modules/inpaint_worker.py b/modules/inpaint_worker.py index 0bb21bc4..f83752eb 100644 --- a/modules/inpaint_worker.py +++ b/modules/inpaint_worker.py @@ -97,16 +97,24 @@ def solve_abcd(x, a, b, c, d, k, outpaint): break if area_abcd(a, b, c, d) >= max_area: break - if (b - a) < (d - c): - a -= 2 - b += 2 - c -= 1 - d += 1 - else: + + add_h = (b - a) < (d - c) + add_w = not add_h + + if b - a == H: + add_w = True + + if d - c == W: + add_h = True + + if add_h: a -= 1 b += 1 - c -= 2 - d += 2 + + if add_w: + c -= 1 + d += 1 + a, b, c, d = regulate_abcd(x, a, b, c, d) return a, b, c, d