Skip to content

Commit b4d629d

Browse files
authored
Merge branch 'main' into cogvideox1.1-5b
2 parents f47516d + 1d2204d commit b4d629d

File tree

9 files changed

+4
-5
lines changed

9 files changed

+4
-5
lines changed

docs/source/en/api/pipelines/controlnet_sd3.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ This controlnet code is mainly implemented by [The InstantX Team](https://huggin
2828
| ControlNet type | Developer | Link |
2929
| -------- | ---------- | ---- |
3030
| Canny | [The InstantX Team](https://huggingface.co/InstantX) | [Link](https://huggingface.co/InstantX/SD3-Controlnet-Canny) |
31+
| Depth | [The InstantX Team](https://huggingface.co/InstantX) | [Link](https://huggingface.co/InstantX/SD3-Controlnet-Depth) |
3132
| Pose | [The InstantX Team](https://huggingface.co/InstantX) | [Link](https://huggingface.co/InstantX/SD3-Controlnet-Pose) |
3233
| Tile | [The InstantX Team](https://huggingface.co/InstantX) | [Link](https://huggingface.co/InstantX/SD3-Controlnet-Tile) |
3334
| Inpainting | [The AlimamaCreative Team](https://huggingface.co/alimama-creative) | [link](https://huggingface.co/alimama-creative/SD3-Controlnet-Inpainting) |
File renamed without changes.

src/diffusers/image_processor.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -795,13 +795,11 @@ def apply_overlay(
795795
The final image with the overlay applied.
796796
"""
797797

798-
width, height = image.width, image.height
799-
800-
init_image = self.resize(init_image, width=width, height=height)
801-
mask = self.resize(mask, width=width, height=height)
798+
width, height = init_image.width, init_image.height
802799

803800
init_image_masked = PIL.Image.new("RGBa", (width, height))
804801
init_image_masked.paste(init_image.convert("RGBA").convert("RGBa"), mask=ImageOps.invert(mask.convert("L")))
802+
805803
init_image_masked = init_image_masked.convert("RGBA")
806804

807805
if crop_coords is not None:

src/diffusers/loaders/ip_adapter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def load_ip_adapter(
7474
list is passed, it should have the same length as `weight_name`.
7575
weight_name (`str` or `List[str]`):
7676
The name of the weight file to load. If a list is passed, it should have the same length as
77-
`weight_name`.
77+
`subfolder`.
7878
image_encoder_folder (`str`, *optional*, defaults to `image_encoder`):
7979
The subfolder location of the image encoder within a larger model repository on the Hub or locally.
8080
Pass `None` to not load the image encoder. If the image encoder is located in a folder inside

0 commit comments

Comments
 (0)