add dilate

app.py

@@ -13,7 +13,7 @@ def sanitize_prompt(prompt):
   return sanitized_prompt
 
 #@spaces.GPU(duration=120)
-def process_images(image, image2=None,inpaint_radius=3,blur_radius=25,edge_expand=8,inpaint_mode="Telea",progress=gr.Progress(track_tqdm=True)):
+def process_images(image, image2=None,inpaint_radius=3,blur_radius=25,edge_expand=8,inpaint_mode="Telea",dilate=0,progress=gr.Progress(track_tqdm=True)):
     progress(0, desc="Start Inpainting")
     #print("process_images")
     # I'm not sure when this happen
@@ -40,9 +40,9 @@ def process_images(image, image2=None,inpaint_radius=3,blur_radius=25,edge_expan
          pass
          #print("size ok")
 
-    output = opencvinpaint.process_cvinpaint(image["background"],mask,inpaint_radius,blur_radius,edge_expand,inpaint_mode)
+    output,cvmask = opencvinpaint.process_cvinpaint(image["background"],mask,inpaint_radius,blur_radius,edge_expand,inpaint_mode,dilate)
         
-    return output,mask
+    return output,cvmask
     
 
 # code from https://huggingface.co/spaces/diffusers/stable-diffusion-xl-inpainting/blob/main/app.py
@@ -96,9 +96,10 @@ with gr.Blocks(css=css, elem_id="demo-container") as demo:
                     image_mask = gr.Image(sources=['upload','clipboard'],  elem_id="mask_upload", type="pil", label="Mask_Upload",height=400, value=None)
                     with gr.Accordion(label="Advanced Settings", open=False):
                         with gr.Row( equal_height=True):
-                            inpaint_radius = gr.Number(value=3, minimum=1.0, maximum=20.0, step=1, label="Inpaint Radius")
-                            blur_radius = gr.Number(value=25, minimum=0.0, maximum=50.0, step=1, label="Blur Radius")
-                            edge_expand = gr.Number(value=8, minimum=0.0, maximum=20.0, step=1, label="Edge Expand")
+                            inpaint_radius = gr.Slider(value=3, minimum=1.0, maximum=20.0, step=1, label="Inpaint Radius",info="increse become slow but smooth")
+                            blur_radius = gr.Slider(value=25, minimum=0.0, maximum=50.0, step=1, label="Blur Radius",info="not bluar mask,inner blur")
+                            edge_expand = gr.Slider(value=8, minimum=0.0, maximum=20.0, step=1, label="Edge Expand",info="not mask extend,for smooth mix")
+                            dilate = gr.Slider(value=0, minimum=0.0, maximum=40.0, step=1, label="Dilate",info="extend mask,but make slow")
                     with gr.Row(equal_height=True):
                             modes = ["Telea", "Navier-Stokes"]
                             inpaint_mode = gr.Dropdown(label="modes", choices=modes, value="Telea") 
@@ -108,7 +109,7 @@ with gr.Blocks(css=css, elem_id="demo-container") as demo:
                     
             
 
-    btn.click(fn=process_images, inputs=[image, image_mask,inpaint_radius,blur_radius,edge_expand,inpaint_mode], outputs =[image_out,mask_out], api_name='infer')
+    btn.click(fn=process_images, inputs=[image, image_mask,inpaint_radius,blur_radius,edge_expand,inpaint_mode,dilate], outputs =[image_out,mask_out], api_name='infer')
     gr.Examples(
                examples=[["examples/00207245.jpg", "examples/00207245_mask.jpg","examples/00207245.webp"],
                          ["examples/00047689.jpg", "examples/00047689_mask.jpg","examples/00047689.webp"]]

opencvinpaint.py

@@ -43,17 +43,26 @@ def blend_rgb_images(image1: np.ndarray, image2: np.ndarray, mask: np.ndarray) -
 
     return blended.astype(np.uint8)
 
-def process_cvinpaint(image,mask_image,inpaint_radius,blur_radius,edge_expand,inpaint_mode):
+def process_cvinpaint(image,mask_image,inpaint_radius,blur_radius,edge_expand,inpaint_mode,dilate=0):
     #print("process cvinpaint")
     #print(blur_radius,",",edge_expand)
     cv_image = pil_to_cv(image)
 
     cv_mask = pil_to_cv(mask_image)
+
+  
+
+
     cv_gray = cv2.cvtColor(cv_mask,cv2.COLOR_BGR2GRAY)
+    
 
     mask = gray3d_to_2d(cv_gray)
-    cv2.imwrite("_mask.jpg",mask)
-    cv2.imwrite("_image.jpg",cv_image)
+    if dilate>0:
+        kernel = np.ones((dilate, dilate), np.uint8)
+        mask = cv2.dilate(mask, kernel, iterations=1)
+
+    #cv2.imwrite("_mask.jpg",mask)
+    #cv2.imwrite("_image.jpg",cv_image)
     mode = cv2.INPAINT_TELEA if inpaint_mode == "Telea" else cv2.INPAINT_NS
     img_inpainted = cv2.inpaint(cv_image, mask,inpaint_radius, mode)
     if debug:
@@ -88,7 +97,7 @@ def process_cvinpaint(image,mask_image,inpaint_radius,blur_radius,edge_expand,in
     if output_image.shape[2] == 3:  # カラー
         output_image = cv2.cvtColor(output_image, cv2.COLOR_BGR2RGB)
     
-    return Image.fromarray(output_image)
+    return Image.fromarray(output_image),Image.fromarray(mask)
 
 if __name__ == "__main__":
     image = Image.open(sys.argv[1])