Hopiu/django-imagekit
1
0
Fork 0
mirror of https://github.com/Hopiu/django-imagekit.git synced 2026-05-09 22:04:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Processors no longer take a file argument.

Browse source 
They only get the image to process now.
This commit is contained in:
Eric Eldredge 2011-09-23 21:25:47 -04:00
parent d99bf5327b
commit 8a0bc084fe
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
imagekit/models.py
View file

@ -26,7 +26,7 @@ class _ImageSpecMixin(object):
def process(self, image, file): def process(self, image, file):
processors = ProcessorPipeline(self.processors) processors = ProcessorPipeline(self.processors)
return processors.process(image.copy(), file) return processors.process(image.copy())
class ImageSpec(_ImageSpecMixin): class ImageSpec(_ImageSpecMixin):

18
imagekit/processors.py
View file

@ -12,7 +12,7 @@ from imagekit.lib import *
class ImageProcessor(object): class ImageProcessor(object):
""" Base image processor class """ """ Base image processor class """
def process(self, img, file): def process(self, img):
return img return img
@ -22,9 +22,9 @@ class ProcessorPipeline(ImageProcessor, list):
list of them. list of them.
""" """
def process(self, img, file): def process(self, img):
for proc in self: for proc in self:
img = proc.process(img, file) img = proc.process(img)
return img return img
@ -36,7 +36,7 @@ class Adjust(ImageProcessor):
self.contrast = contrast self.contrast = contrast
self.sharpness = sharpness self.sharpness = sharpness
def process(self, img, file): def process(self, img):
img = img.convert('RGB') img = img.convert('RGB')
for name in ['Color', 'Brightness', 'Contrast', 'Sharpness']: for name in ['Color', 'Brightness', 'Contrast', 'Sharpness']:
factor = getattr(self, name.lower()) factor = getattr(self, name.lower())
@ -53,7 +53,7 @@ class Reflection(ImageProcessor):
size = 0.0 size = 0.0
opacity = 0.6 opacity = 0.6
def process(self, img, file): def process(self, img):
# convert bgcolor string to rgb value # convert bgcolor string to rgb value
background_color = ImageColor.getrgb(self.background_color) background_color = ImageColor.getrgb(self.background_color)
# handle palleted images # handle palleted images
@ -99,7 +99,7 @@ class _Resize(ImageProcessor):
if height is not None: if height is not None:
self.height = height self.height = height
def process(self, img, file): def process(self, img):
raise NotImplementedError('process must be overridden by subclasses.') raise NotImplementedError('process must be overridden by subclasses.')
@ -131,7 +131,7 @@ class Crop(_Resize):
super(Crop, self).__init__(width, height) super(Crop, self).__init__(width, height)
self.anchor = anchor self.anchor = anchor
def process(self, img, file): def process(self, img):
cur_width, cur_height = img.size cur_width, cur_height = img.size
horizontal_anchor, vertical_anchor = Crop._ANCHOR_PTS[self.anchor or \ horizontal_anchor, vertical_anchor = Crop._ANCHOR_PTS[self.anchor or \
Crop.CENTER] Crop.CENTER]
@ -159,7 +159,7 @@ class Fit(_Resize):
super(Fit, self).__init__(width, height) super(Fit, self).__init__(width, height)
self.upscale = upscale self.upscale = upscale
def process(self, img, file): def process(self, img):
cur_width, cur_height = img.size cur_width, cur_height = img.size
if not self.width is None and not self.height is None: if not self.width is None and not self.height is None:
ratio = min(float(self.width)/cur_width, ratio = min(float(self.width)/cur_width,
@ -222,7 +222,7 @@ class Transpose(ImageProcessor):
if args: if args:
self.methods = args self.methods = args
def process(self, img, file): def process(self, img):
if self.AUTO in self.methods: if self.AUTO in self.methods:
raise Exception("AUTO is not yet supported. Sorry!") raise Exception("AUTO is not yet supported. Sorry!")
try: try: