diff --git a/TODO b/TODO index c4947ab4..0bb4f706 100644 --- a/TODO +++ b/TODO @@ -1,56 +1,4 @@ - -- do clip etc. in new style, good to get everything that VipsAdd uses in - the new stack - - insert* needs im_black() - - can we move everything to new-style ops now? - -- what's the performance hit for removing the 1ary lintra path? - - - - -- try: - - $ vips insert Gugg_coloured.jpg x.jpg x.v 100 100 --expand --background "1 2 3" - - often gets the BG colour wrong, eg. notworking: - -$ vips insert Gugg_coloured.jpg x.jpg x.v 100 100 --expand --background "1 2 3" -vips__vector_to_ink: starting -vips_cast_build: 0xbff920 -vips_cast_build: 0xbff920 done -vips_cast_gen: 0xbff920 -vips__vector_to_ink: ink = 0xc1c660 (1 2 3) - - vs. working: - -$ vips insert Gugg_coloured.jpg x.jpg x.v 100 100 --expand --background "1 2 3" -vips__vector_to_ink: starting -vips_cast_build: 0x1760920 -vips_cast_build: 0x1760920 done -vips__vector_to_ink: ink = 0x177d660 (0 0 0) - - vips_cast_gen() is never called??? - - vips__vector_to_ink() breakage something to do with the new bandjoin thing? - - strange, seems to work on laptop, try again on desktop - - - - - - - - - - - - - - bandalike: consider RGB + RGBA ... we should bandup by adding a black band (or white?? unclear) diff --git a/libvips/arithmetic/linear.c b/libvips/arithmetic/linear.c index 531c960b..f97a069f 100644 --- a/libvips/arithmetic/linear.c +++ b/libvips/arithmetic/linear.c @@ -37,6 +37,7 @@ * - remove liboil * 31/10/11 * - rework as a class + * - removed the 1-ary constant path, no faster */ /* diff --git a/libvips/conversion/insert.c b/libvips/conversion/insert.c index 994f04b1..25d3ec8d 100644 --- a/libvips/conversion/insert.c +++ b/libvips/conversion/insert.c @@ -57,8 +57,8 @@ */ /* - */ #define VIPS_DEBUG + */ #ifdef HAVE_CONFIG_H #include @@ -268,7 +268,7 @@ vips__vector_to_ink( const char *domain, VipsImage *im, double *vec, int n ) #ifdef VIPS_DEBUG { - PEL *p = t[3]->data; + PEL *p = (PEL *) (t[3]->data); printf( "vips__vector_to_ink: ink = %p (%d %d %d)\n", p, p[0], p[1], p[2] );