Replace PIL with CV2 for image IO

tasercake · Aug 31, 2020 · 2b569a7 · 2b569a7
1 parent 62b5a07
commit 2b569a7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/lowpolypy/lowpoly_stages.py b/lowpolypy/lowpoly_stages.py
@@ -30,11  30,12 @@ def forward(self, data, *args, **kwargs):
     def __call__(self, data, *args, **kwargs):
         data = dict(data)
         image = data["image"]
         image_dims = image.shape[::-1]
         data.update(super().__call__(data, *args, **kwargs))
         points = data["points"]
-        points = self.rescale_points(points, image.size)
         points = self.rescale_points(points, image_dims)
         points = self.remove_duplicates(points, 4)
-        points = self.with_boundary_points(points, image.size)
         points = self.with_boundary_points(points, image_dims)
         data["points"] = points
         return data
 
@@ -234,7  235,6 @@ def __init__(self):
 
     def forward(self, data):
         image, polygons = data["image"], data["polygons"]
-        image = np.array(image)
         shaded = np.array(image)
         mask = np.zeros((*image.shape[:2], 1), dtype=np.uint8)
         for polygon in polygons:
@@ -249,7  249,7 @@ def forward(self, data):
                 lineType=cv2.LINE_AA,
                 shift=8,
             )
-        return {"image": Image.fromarray(shaded)}
         return {"image": shaded}
 
 
 @registry.register("LowPolyStage", "KmeansShader")
@@ -278,7  278,6 @@ def get_dominant_color(pixels, num_clusters, attempts):
 
     def forward(self, data):
         image, polygons = data["image"], data["polygons"]
-        image = np.array(image)
         shaded = np.zeros_like(image)
         for polygon in polygons:
             coords = np.array(polygon.exterior.coords)
@@ -296,4  295,4 @@ def forward(self, data):
                 lineType=cv2.LINE_AA,
                 shift=8,
             )
-        return {"image": Image.fromarray(shaded)}
         return {"image": shaded}
diff --git a/lowpolypy/run.py b/lowpolypy/run.py
@@ -1,4  1,5 @@
 import os
 import cv2
 import json
 from pathlib import Path
 from PIL import Image
@@ -28,7  29,8 @@ def run(config) -> Dict[str, dict]:
     source = Path(config.files.source)
     if not source.is_file():
         raise ValueError(f"source must be an image file. Got '{source}'")
-    image = Image.open(source)
     image = cv2.imread(source)
     # image = cv2.cvtColor(image, cv2.COLOR_BGR2RGB)
 
     destination = Path(config.files.destination or source.parent / "lowpoly")
     if destination.is_dir():
@@ -41,7  43,7 @@ def run(config) -> Dict[str, dict]:
         registry.get("LowPolyStage", stage_name)(**stage_options)
         for stage_name, stage_options in config.pipeline.items()
     ])
-    data = pipeline({"image":image, "stages":pipeline.stages})
     data = pipeline({"image": image, "stages": pipeline.stages})
 
     shaded = data["image"]
     shaded.save(destination, quality=95)