Foreign-Mirrors/Fooocus
1
0
Fork 0
mirror of https://github.com/lllyasviel/Fooocus.git synced 2026-08-16 13:13:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/add-inpaint-mask-generation'

Browse Source 
# Conflicts:
#	language/en.json
#	modules/config.py
This commit is contained in:
Manuel Schmid
2024-03-03 15:14:20 +01:00
parent 57c9c5a95e bf63506e89
commit 8e999764a8
4 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/async_worker.py
+11 -7
View File
@@ -354,13 +354,17 @@ def worker():
inpaint_mask = inpaint_input_image['mask'][:, :, 0]
if inpaint_mask_upload_checkbox:
if isinstance(inpaint_mask_image_upload, np.ndarray):
if inpaint_mask_image_upload.ndim == 3:
H, W, C = inpaint_image.shape
inpaint_mask_image_upload = resample_image(inpaint_mask_image_upload, width=W, height=H)
inpaint_mask_image_upload = np.mean(inpaint_mask_image_upload, axis=2)
inpaint_mask_image_upload = (inpaint_mask_image_upload > 127).astype(np.uint8) * 255
inpaint_mask = np.maximum(inpaint_mask, inpaint_mask_image_upload)
if isinstance(inpaint_mask_image_upload, dict):
if (isinstance(inpaint_mask_image_upload['image'], np.ndarray)
and isinstance(inpaint_mask_image_upload['mask'], np.ndarray)
and inpaint_mask_image_upload['image'].ndim == 3):
inpaint_mask_image_upload = np.maximum(inpaint_mask_image_upload['image'], inpaint_mask_image_upload['mask'])
if isinstance(inpaint_mask_image_upload, np.ndarray) and inpaint_mask_image_upload.ndim == 3:
H, W, C = inpaint_image.shape
inpaint_mask_image_upload = resample_image(inpaint_mask_image_upload, width=W, height=H)
inpaint_mask_image_upload = np.mean(inpaint_mask_image_upload, axis=2)
inpaint_mask_image_upload = (inpaint_mask_image_upload > 127).astype(np.uint8) * 255
inpaint_mask = np.maximum(inpaint_mask, inpaint_mask_image_upload)
if int(inpaint_erode_or_dilate) != 0:
inpaint_mask = erode_or_dilate(inpaint_mask, inpaint_erode_or_dilate)