Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Optimize QRColorMask apply_mask method for enhanced performance #372

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Optimize QRColorMask apply_mask method for enhanced performance #372

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
820eacf
Optimize QRColorMask apply_mask method for enhanced performance
smalyu Sep 2, 2024
c4b9bd8
Merge branch 'lincolnloop:main' into patch-1
smalyu Oct 4, 2024
8c8632a
Fix cache-related bug in apply_mask for masks with position-dependent…
smalyu Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 20 additions & 13 deletions qrcode/image/styles/colormasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,24 +27,31 @@ class QRColorMask:
def initialize(self, styledPilImage, image):
self.paint_color = styledPilImage.paint_color

def apply_mask(self, image):
def apply_mask(self, image, use_cache=False):
width, height = image.size
pixels = image.load()
fg_color_cache = {} if use_cache else None
for x in range(width):
for y in range(height):
norm = self.extrap_color(
self.back_color, self.paint_color, image.getpixel((x, y))
)
current_color = pixels[x, y]
if current_color == self.back_color:
continue
if use_cache and current_color in fg_color_cache:
pixels[x, y] = fg_color_cache[current_color]
continue
norm = self.extrap_color(self.back_color, self.paint_color, current_color)
if norm is not None:
image.putpixel(
(x, y),
self.interp_color(
self.get_bg_pixel(image, x, y),
self.get_fg_pixel(image, x, y),
norm,
),
new_color = self.interp_color(
self.get_bg_pixel(image, x, y),
self.get_fg_pixel(image, x, y),
norm
)
pixels[x, y] = new_color

if use_cache:
fg_color_cache[current_color] = new_color
else:
image.putpixel((x, y), self.get_bg_pixel(image, x, y))
pixels[x, y] = self.get_bg_pixel(image, x, y)

def get_fg_pixel(self, image, x, y):
raise NotImplementedError("QRModuleDrawer.paint_fg_pixel")
Expand Down Expand Up @@ -103,7 +110,7 @@ def apply_mask(self, image):
# the individual pixel comparisons that the base class uses, which
# would be a lot faster. (In fact doing this would probably remove
# the need for the B&W optimization above.)
QRColorMask.apply_mask(self, image)
QRColorMask.apply_mask(self, image, use_cache=True)

def get_fg_pixel(self, image, x, y):
return self.front_color
Expand Down