Skip to content

armgit / manim

Public Imported from GitHub
0

A community-maintained Python framework for creating mathematical animations.

fix(constants.py,image_mobject.py,opengl_image_mobject.py): Update deprecated pillow constants (#2715)

Tristan Schulz8627f2a27d2b
diff --git a/manim/constants.py b/manim/constants.py
index 6206ec677..a32bf416b 100644
--- a/manim/constants.py
+++ b/manim/constants.py
@@ -6,7 +6,7 @@ from __future__ import annotations
import numpy as np
from cloup import Context
-from PIL import Image
+from PIL.Image import Resampling
__all__ = [
"NOT_SETTING_FONT_MSG",
@@ -113,16 +113,16 @@ HEAVY: str = "HEAVY"
ULTRAHEAVY: str = "ULTRAHEAVY"
RESAMPLING_ALGORITHMS = {
- "nearest": Image.NEAREST,
- "none": Image.NEAREST,
- "lanczos": Image.LANCZOS,
- "antialias": Image.LANCZOS,
- "bilinear": Image.BILINEAR,
- "linear": Image.BILINEAR,
- "bicubic": Image.BICUBIC,
- "cubic": Image.BICUBIC,
- "box": Image.BOX,
- "hamming": Image.HAMMING,
+ "nearest": Resampling.NEAREST,
+ "none": Resampling.NEAREST,
+ "lanczos": Resampling.LANCZOS,
+ "antialias": Resampling.LANCZOS,
+ "bilinear": Resampling.BILINEAR,
+ "linear": Resampling.BILINEAR,
+ "bicubic": Resampling.BICUBIC,
+ "cubic": Resampling.BICUBIC,
+ "box": Resampling.BOX,
+ "hamming": Resampling.HAMMING,
}
# Geometry: directions
diff --git a/manim/mobject/opengl/opengl_image_mobject.py b/manim/mobject/opengl/opengl_image_mobject.py
index 59727f2ea..96d69e4a1 100644
--- a/manim/mobject/opengl/opengl_image_mobject.py
+++ b/manim/mobject/opengl/opengl_image_mobject.py
@@ -8,6 +8,7 @@ from pathlib import Path
import numpy as np
from PIL import Image
+from PIL.Image import Resampling
from manim.mobject.opengl.opengl_surface import OpenGLSurface, OpenGLTexturedSurface
from manim.utils.images import get_full_raster_image_path
@@ -20,7 +21,7 @@ class OpenGLImageMobject(OpenGLTexturedSurface):
width: float = None,
height: float = None,
image_mode: str = "RGBA",
- resampling_algorithm: int = Image.BICUBIC,
+ resampling_algorithm: int = Resampling.BICUBIC,
opacity: float = 1,
gloss: float = 0,
shadow: float = 0,
diff --git a/manim/mobject/types/image_mobject.py b/manim/mobject/types/image_mobject.py
index 241a7e3fa..80b875599 100644
--- a/manim/mobject/types/image_mobject.py
+++ b/manim/mobject/types/image_mobject.py
@@ -9,6 +9,7 @@ import pathlib
import colour
import numpy as np
from PIL import Image
+from PIL.Image import Resampling
from manim.mobject.geometry.shape_matchers import SurroundingRectangle
@@ -38,7 +39,7 @@ class AbstractImageMobject(Mobject):
self,
scale_to_resolution,
pixel_array_dtype="uint8",
- resampling_algorithm=Image.BICUBIC,
+ resampling_algorithm=Resampling.BICUBIC,
**kwargs,
):
self.pixel_array_dtype = pixel_array_dtype