From 8fe31528cfc68b8dba253074042370794e5c8637 Mon Sep 17 00:00:00 2001 From: Paul Franklin Date: Thu, 12 Mar 2015 10:11:11 -0700 Subject: [PATCH] 8423: Python3 needs new_subpixbuf not subpixbuf --- gramps/gen/utils/image.py | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/gramps/gen/utils/image.py b/gramps/gen/utils/image.py index 74f02d9b1..c66fbdb71 100644 --- a/gramps/gen/utils/image.py +++ b/gramps/gen/utils/image.py @@ -90,10 +90,7 @@ def resize_to_jpeg(source, destination, width, height, crop=None): (start_x, start_y, end_x, end_y ) = crop_percentage_to_pixel( img.get_width(), img.get_height(), crop) - if sys.version_info[0] < 3: - img = img.new_subpixbuf(start_x, start_y, end_x-start_x, end_y-start_y) - else: - img = img.subpixbuf(start_x, start_y, end_x-start_x, end_y-start_y) + img = img.new_subpixbuf(start_x, start_y, end_x-start_x, end_y-start_y) # Need to keep the ratio intact, otherwise scaled images look stretched # if the dimensions aren't close in size @@ -231,10 +228,7 @@ def resize_to_buffer(source, size, crop=None): (start_x, start_y, end_x, end_y ) = crop_percentage_to_pixel( img.get_width(), img.get_height(), crop) - if sys.version_info[0] < 3: - img = img.new_subpixbuf(start_x, start_y, end_x-start_x, end_y-start_y) - else: - img = img.subpixbuf(start_x, start_y, end_x-start_x, end_y-start_y) + img = img.new_subpixbuf(start_x, start_y, end_x-start_x, end_y-start_y) # Need to keep the ratio intact, otherwise scaled images look stretched # if the dimensions aren't close in size @@ -272,10 +266,7 @@ def resize_to_jpeg_buffer(source, size, crop=None): ) = crop_percentage_to_pixel( img.get_width(), img.get_height(), crop) - if sys.version_info[0] < 3: - img = img.new_subpixbuf(start_x, start_y, end_x-start_x, end_y-start_y) - else: - img = img.subpixbuf(start_x, start_y, end_x-start_x, end_y-start_y) + img = img.new_subpixbuf(start_x, start_y, end_x-start_x, end_y-start_y) # Need to keep the ratio intact, otherwise scaled images look stretched # if the dimensions aren't close in size