diff --git a/Scrapers/scraper.py b/Scrapers/scraper.py index 1eaea40..bf7f4c3 100644 --- a/Scrapers/scraper.py +++ b/Scrapers/scraper.py @@ -3,7 +3,6 @@ from urllib3.util import Retry import re import os -from PIL import Image import glob import sys import shutil @@ -92,10 +91,10 @@ def convert_images(folder, format, quality=100, crop=False): for filename in all_files: new_filename = os.path.splitext(filename)[0] + '.' + format if not crop: - im = Image.open(filename) - if format in ("jpeg") and im.mode in ("RGBA", "P"): - im = im.convert("RGB") - im.save(new_filename, format, quality=quality) + img = cv2.imdecode( + np.fromfile(filename, dtype=np.uint8), cv2.IMREAD_UNCHANGED + ) + Scraper.save_img(img, new_filename, format, quality) else: img = Scraper.auto_crop(filename) Scraper.save_img(img, new_filename, format, quality) diff --git a/requirements.txt b/requirements.txt index 8046cba..f1dbd4a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,3 @@ -numpy==1.21.4+vanilla -Pillow==9.1.1 -requests==2.22.0 +requests==2.27.1 tabulate==0.8.9 -urllib3==1.25.3 +urllib3==1.26.9