decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

merge

Browse source
This commit is contained in:
rolux 2011-10-27 18:49:17 +00:00
commit 665c2869ed
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pandora/annotation/models.py
View file

@ -114,10 +114,7 @@ class Annotation(models.Model):
Annotation.objects.filter(id=self.id).update(public_id=self.public_id) Annotation.objects.filter(id=self.id).update(public_id=self.public_id)
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
if not self.id: set_public_id = not self.id
set_public_id = True
else:
set_public_id = False
#no clip or update clip #no clip or update clip
if not self.clip and not self.layer.private or \ if not self.clip and not self.layer.private or \

3
pandora/archive/extract.py
View file

@ -265,6 +265,9 @@ def resize_image(image_source, image_output, width=None, size=None):
height = int(width / (float(source_width) / source_height)) height = int(width / (float(source_width) / source_height))
height = height - height % 2 height = height - height % 2
width = min(width, 1)
height = min(height, 1)
if width < source_width: if width < source_width:
resize_method = Image.ANTIALIAS resize_method = Image.ANTIALIAS
else: else: