fix

Author: MeetWq

meme_generator_memes/src/memes/douyin.rs

@@ -111,6 +111,12 @@ fn douyin(_: Vec<InputImage>, texts: Vec<String>, _: NoOptions) -> Result<Vec<u8
         ];
         let frame = frame.perspective(&points);
 
+        let mut surface = frame.to_surface();
+        let canvas = surface.canvas();
+        canvas.clear(bg_color);
+        canvas.draw_image(&frame, (0, 0), None);
+        let frame = surface.image_snapshot();
+
         encoder.add_frame(frame, 0.2)?;
     }
 

meme_generator_memes/src/memes/keep_away.rs

@@ -25,10 +25,11 @@ fn keep_away(images: Vec<InputImage>, texts: Vec<String>, _: NoOptions) -> Resul
     let canvas = surface.canvas();
     canvas.clear(Color::WHITE);
     canvas
-        .draw_text_area(
+        .draw_text_area_auto_font_size(
             IRect::from_ltrb(10, 10, 390, 80),
             text,
-            30.0,
+            20.0,
+            40.0,
             text_params!(text_align = TextAlign::Left),
         )
         .unwrap();

meme_generator_py/meme_generator.pyi

@@ -37,22 +37,20 @@ class FloatOption:
     description: Optional[str]
     parser_flags: ParserFlags
 
-MemeOption = Union[BooleanOption, StringOption, IntegerOption, FloatOption]
-
 class MemeParams:
     min_images: int
     max_images: int
     min_texts: int
     max_texts: int
     default_texts: list[str]
-    options: list[MemeOption]
+    options: list[Union[BooleanOption, StringOption, IntegerOption, FloatOption]]
 
 class MemeShortcut:
     pattern: str
     humanized: Optional[str]
     names: list[str]
     texts: list[str]
-    options: dict[str, OptionValue]
+    options: dict[str, Union[bool, str, int, float]]
 
 class MemeInfo:
     key: str
@@ -94,21 +92,6 @@ class TextOverLength:
 class MemeFeedback:
     feedback: str
 
-OptionValue = Union[bool, str, int, float]
-
-MemeError = Union[
-    ImageDecodeError,
-    ImageEncodeError,
-    ImageAssetMissing,
-    DeserializeError,
-    ImageNumberMismatch,
-    TextNumberMismatch,
-    TextOverLength,
-    MemeFeedback,
-]
-
-MemeResult = Union[bytes, MemeError]
-
 class Meme:
     @property
     def key(self) -> str: ...
@@ -118,9 +101,31 @@ class Meme:
         self,
         images: list[Image],
         text: list[str],
-        options: dict[str, OptionValue],
-    ) -> MemeResult: ...
-    def generate_preview(self) -> MemeResult: ...
+        options: dict[str, Union[bool, str, int, float]],
+    ) -> Union[
+        bytes,
+        ImageDecodeError,
+        ImageEncodeError,
+        ImageAssetMissing,
+        DeserializeError,
+        ImageNumberMismatch,
+        TextNumberMismatch,
+        TextOverLength,
+        MemeFeedback,
+    ]: ...
+    def generate_preview(
+        self,
+    ) -> Union[
+        bytes,
+        ImageDecodeError,
+        ImageEncodeError,
+        ImageAssetMissing,
+        DeserializeError,
+        ImageNumberMismatch,
+        TextNumberMismatch,
+        TextOverLength,
+        MemeFeedback,
+    ]: ...
 
 class MemeProperties:
     def __new__(cls, disabled: bool = False, hot: bool = False, new: bool = False): ...
@@ -150,9 +155,9 @@ def render_meme_list(
     sort_reverse: bool = False,
     text_template: str = "{index}. {keywords}",
     add_category_icon: bool = True,
-) -> MemeResult: ...
+) -> Union[bytes, ImageEncodeError]: ...
 def render_meme_statistics(
     title: str,
     statistics_type: MemeStatisticsType,
     data: list[tuple[str, int]],
-) -> MemeResult: ...
+) -> Union[bytes, ImageEncodeError]: ...