stuartl/tornado-gallery
1
0
Fork 0
mirror of https://github.com/sjlongland/tornado-gallery.git synced 2025-09-13 08:42:23 +10:00
Code Issues Releases Wiki Activity

photo: Use calc_dimensions function from resizer.

Browse Source
This commit is contained in:
Stuart Longland 2018-04-30 21:48:02 +10:00
parent 8970021396
commit a43005fac2
Signed by: stuartl
GPG Key ID: 6AA32EFB18079BAA
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tornado_gallery/photo.py
View File

@ -2,6 +2,7 @@
from weakref import ref
from tornado.gen import coroutine, Return
from .resizer import calc_dimensions
try:
import piexif
@ -159,21 +160,7 @@ class Photo(object):
"""
Get the actual size of a photo that fits in the bounding box given.
"""
orig_width = self.width
orig_height = self.height
if not width:
if height:
width = int((height * self.ratio) + 0.5)
else:
width = orig_width
if not height:
if width:
height = int((width / self.ratio) + 0.5)
else:
height = orig_height
return (width, height)
return calc_dimensions(self.width, self.height, width, height)
def get_rel_uri(self, width=720, height=None, rotation=0.0, quality=60.0,
img_format=None):