Merge branch 'master' of github.com:jcupitt/libvips

This commit is contained in:
John Cupitt 2015-07-30 11:34:12 +01:00
commit b3085f9f09
1 changed files with 2 additions and 1 deletions

View File

@ -442,7 +442,8 @@ def vips_image_new_from_array(cls, array, scale = 1, offset = 0):
height = 1 height = 1
width = len(array) width = len(array)
else: else:
flat_array = array[0] # must copy the first row, we don't want to modify the passed-in array
flat_array = list(array[0])
height = len(array) height = len(array)
width = len(array[0]) width = len(array[0])
for i in range(1, height): for i in range(1, height):