From ce8d7e57892652a65d986722d31d788dcb835b23 Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Sat, 13 Sep 2014 18:03:25 +0100 Subject: [PATCH] tweaks --- libvips/create/mask_ideal.c | 2 -- python/test_arithmetic.py | 46 ++++++++++++++++++++----------------- 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/libvips/create/mask_ideal.c b/libvips/create/mask_ideal.c index e0b170c1..54625e75 100644 --- a/libvips/create/mask_ideal.c +++ b/libvips/create/mask_ideal.c @@ -72,8 +72,6 @@ vips_mask_ideal_class_init( VipsMaskIdealClass *class ) VipsObjectClass *vobject_class = VIPS_OBJECT_CLASS( class ); VipsMaskClass *mask_class = VIPS_MASK_CLASS( class ); - printf( "vips_mask_ideal_class_init\n" ); - gobject_class->set_property = vips_object_set_property; gobject_class->get_property = vips_object_get_property; diff --git a/python/test_arithmetic.py b/python/test_arithmetic.py index 4195dbff..54c0d7f8 100755 --- a/python/test_arithmetic.py +++ b/python/test_arithmetic.py @@ -1,9 +1,10 @@ #!/usr/bin/python import unittest +import gc -import logging -logging.basicConfig(level = logging.DEBUG) +#import logging +#logging.basicConfig(level = logging.DEBUG) from gi.repository import Vips from vips8 import vips @@ -20,11 +21,6 @@ cformats = [Vips.BandFormat.COMPLEX, Vips.BandFormat.DPCOMPLEX] all_formats = formats + cformats; -im = Vips.Image.mask_ideal(100, 100, 0.5) -colour = im * [100, 128, 140] + [20, 30, 40] -mono = colour.extract_band(1) -all_images = [mono, colour] - # an expanding zip ... if either of the args is not a list, duplicate it down # the other def zip_expand(x, y): @@ -83,8 +79,8 @@ class TestArithmetic(unittest.TestCase): def run_arith_const(self, fn, fmt = all_formats): [self.run_testconst(fn.func_name + ' scalar', fn, x.cast(y), 12) - for x in all_images for y in fmt] - [self.run_testconst(fn.func_name + ' vector', fn, colour.cast(y), + for x in self.all_images for y in fmt] + [self.run_testconst(fn.func_name + ' vector', fn, self.colour.cast(y), [12, 13, 14]) for y in formats] @@ -108,28 +104,34 @@ class TestArithmetic(unittest.TestCase): def run_arith(self, fn, fmt = all_formats): [self.run_test2(fn.func_name + ' image', x.cast(y), x.cast(z), fn) - for x in all_images for y in fmt for z in fmt] + for x in self.all_images for y in fmt for z in fmt] + + def setUp(self): + im = Vips.Image.mask_ideal(100, 100, 0.5) + self.colour = im * [100, 128, 140] + [20, 30, 40] + self.mono = self.colour.extract_band(1) + self.all_images = [self.mono, self.colour] def test_add(self): def add(x, y): return x + y - #self.run_arith_const(add) - #self.run_arith(add) + self.run_arith_const(add) + self.run_arith(add) def test_sub(self): def sub(x, y): return x - y - #self.run_arith_const(sub) - #self.run_arith(sub) + self.run_arith_const(sub) + self.run_arith(sub) def test_mul(self): def mul(x, y): return x * y - #self.run_arith_const(mul) - #self.run_arith(mul) + self.run_arith_const(mul) + self.run_arith(mul) def test_div(self): def div(x, y): @@ -137,8 +139,8 @@ class TestArithmetic(unittest.TestCase): # div(const / image) needs (image ** -1), which won't work for complex # images ... just test with non-complex - #self.run_arith_const(div, fmt = formats) - #self.run_arith(div) + self.run_arith_const(div, fmt = formats) + self.run_arith(div) # run a function on an image, # 50,50 and 10,10 should have different values on the test image @@ -146,7 +148,7 @@ class TestArithmetic(unittest.TestCase): self.run_cmp(message, im, 50, 50, lambda x: run_fn(fn, x)) self.run_cmp(message, im, 10, 10, lambda x: run_fn(fn, x)) - def run_unary(self, fn, images = all_images, fmt = all_formats): + def run_unary(self, images, fn, fmt = all_formats): [self.run_testunary(fn.func_name + ' image', x.cast(y), fn) for x in images for y in fmt] @@ -154,8 +156,10 @@ class TestArithmetic(unittest.TestCase): def my_abs(x): return abs(x) - #im = -mono; - #self.run_unary(my_abs, [im]) + im = -self.mono; + #self.run_unary([im], my_abs) + + self.run_cmp('poop', im, 50, 50, lambda x: run_fn(my_abs, im)) if __name__ == '__main__': unittest.main()