more tests for arrayjoin

This commit is contained in:
John Cupitt 2015-12-12 12:38:29 +00:00
parent 5916e25c31
commit ff1dd39432

View File

@ -180,11 +180,11 @@ class TestConversion(unittest.TestCase):
self.run_binary(self.all_images, bandjoin)
def test_bandjoin_const(self):
x = self.colour.bandjoin(1)
x = self.colour.ibandjoin(1)
self.assertEqual(x.bands, 4)
self.assertEqual(x[3].avg(), 1)
x = self.colour.bandjoin([1,2])
x = self.colour.ibandjoin([1,2])
self.assertEqual(x.bands, 5)
self.assertEqual(x[3].avg(), 1)
self.assertEqual(x[4].avg(), 2)
@ -630,15 +630,30 @@ class TestConversion(unittest.TestCase):
def test_arrayjoin(self):
max_width = 0
max_height = 0
max_bands = 0
for image in self.all_images:
if image.width > max_width:
max_width = image.width
if image.height > max_height:
max_height = image.height
if image.bands > max_bands:
max_bands = image.bands
im = Vips.Image.arrayjoin(self.all_images)
self.assertEqual(im.width, max_width * len(self.all_images))
self.assertEqual(im.height, max_height)
self.assertEqual(im.bands, max_bands)
im = Vips.Image.arrayjoin(self.all_images, across = 1)
self.assertEqual(im.width, max_width)
self.assertEqual(im.height, max_height * len(self.all_images))
self.assertEqual(im.bands, max_bands)
im = Vips.Image.arrayjoin(self.all_images, shim = 10)
self.assertEqual(im.width, max_width * len(self.all_images) +
10 * (len(self.all_images) - 1))
self.assertEqual(im.height, max_height)
self.assertEqual(im.bands, max_bands)
def test_msb(self):
for fmt in unsigned_formats: