mirrors/Fooocus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use correct masks (#452)

Browse Source
This commit is contained in:
lllyasviel 2023-09-20 03:25:29 -07:00 committed by GitHub
parent b89192162d
commit c9ec6e22ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fooocus_version.py
View File

@ -1 +1 @@
version = '2.0.72' version = '2.0.73'

41
modules/inpaint_worker.py
View File

@ -25,33 +25,25 @@ class InpaintHead(torch.nn.Module):
current_task = None current_task = None
def morphological_soft_open(x):
k = 12
x = Image.fromarray(x)
for _ in range(k):
x = x.filter(ImageFilter.MaxFilter(3))
x = x.filter(ImageFilter.BoxBlur(k * 2 + 1))
x = np.array(x)
return x
def box_blur(x, k): def box_blur(x, k):
x = Image.fromarray(x) x = Image.fromarray(x)
x = x.filter(ImageFilter.BoxBlur(k)) x = x.filter(ImageFilter.BoxBlur(k))
return np.array(x) return np.array(x)
def threshold_0_255(x): def max33(x):
y = np.zeros_like(x) x = Image.fromarray(x)
y[x > 127] = 255 x = x.filter(ImageFilter.MaxFilter(3))
return y return np.array(x)
def morphological_hard_open(x): def morphological_open(x):
y = threshold_0_255(x) x_int32 = np.zeros_like(x).astype(np.int32)
z = morphological_soft_open(x) x_int32[x > 127] = 256
z[y > 127] = 255 for _ in range(32):
return z maxed = max33(x_int32) - 8
x_int32 = np.maximum(maxed, x_int32)
return x_int32.clip(0, 255).astype(np.uint8)
def imsave(x, path): def imsave(x, path):
@ -132,21 +124,20 @@ def fooocus_fill(image, mask):
class InpaintWorker: class InpaintWorker:
def __init__(self, image, mask, is_outpaint): def __init__(self, image, mask, is_outpaint):
# mask processing # mask processing
self.image_raw = fooocus_fill(image, mask) self.mask_raw_soft = morphological_open(mask)
self.mask_raw_user_input = mask
self.mask_raw_soft = morphological_hard_open(mask)
self.mask_raw_fg = (self.mask_raw_soft == 255).astype(np.uint8) * 255 self.mask_raw_fg = (self.mask_raw_soft == 255).astype(np.uint8) * 255
self.mask_raw_bg = (self.mask_raw_soft == 0).astype(np.uint8) * 255 self.mask_raw_bg = (self.mask_raw_soft == 0).astype(np.uint8) * 255
self.mask_raw_trim = 255 - np.maximum(self.mask_raw_fg, self.mask_raw_bg) self.mask_raw_trim = 255 - np.maximum(self.mask_raw_fg, self.mask_raw_bg)
self.mask_raw_error = (self.mask_raw_user_input > self.mask_raw_fg).astype(np.uint8) * 255
# image processing
self.image_raw = fooocus_fill(image, self.mask_raw_fg)
# log all images # log all images
# imsave(self.mask_raw_user_input, 'mask_raw_user_input.png') # imsave(self.image_raw, 'image_raw.png')
# imsave(self.mask_raw_soft, 'mask_raw_soft.png') # imsave(self.mask_raw_soft, 'mask_raw_soft.png')
# imsave(self.mask_raw_fg, 'mask_raw_fg.png') # imsave(self.mask_raw_fg, 'mask_raw_fg.png')
# imsave(self.mask_raw_bg, 'mask_raw_bg.png') # imsave(self.mask_raw_bg, 'mask_raw_bg.png')
# imsave(self.mask_raw_trim, 'mask_raw_trim.png') # imsave(self.mask_raw_trim, 'mask_raw_trim.png')
# imsave(self.mask_raw_error, 'mask_raw_error.png')
# compute abcd # compute abcd
a, b, c, d = compute_initial_abcd(self.mask_raw_bg < 127) a, b, c, d = compute_initial_abcd(self.mask_raw_bg < 127)