sergiotarxz
/
libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arith_binary_const whoops

This commit is contained in:
John Cupitt 2009-09-22 16:51:04 +00:00
parent 0b94dc67bd
commit eae80d2bb4
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libvips/arithmetic/im_add.c
View File

@ -216,13 +216,14 @@ im__bandup( IMAGE *in, IMAGE *out, int n )
* - cast in1 and in2 up to a common format * - cast in1 and in2 up to a common format
* - cast the common format to the output format with the supplied table * - cast the common format to the output format with the supplied table
* - equalise bands * - equalise bands
* - run the supplied buffer operation * - run the supplied buffer operation passing one of the up-banded and
* up-casted inputs as the first param
*/ */
int int
im__arith_binary( const char *name, im__arith_binary( const char *name,
IMAGE *in1, IMAGE *in2, IMAGE *out, IMAGE *in1, IMAGE *in2, IMAGE *out,
int format_table[10], int format_table[10],
im_wrapmany_fn fn, void *a ) im_wrapmany_fn fn, void *b )
{ {
VipsBandFmt fmt; VipsBandFmt fmt;
IMAGE *t[5]; IMAGE *t[5];
@ -262,10 +263,11 @@ im__arith_binary( const char *name,
im__bandup( t[1], t[3], out->Bands ) ) im__bandup( t[1], t[3], out->Bands ) )
return( -1 ); return( -1 );
/* And process! /* And process! The buffer function gets one of the input images as a
* sample.
*/ */
t[4] = NULL; t[4] = NULL;
if( im_wrapmany( t + 2, out, fn, out, a ) ) if( im_wrapmany( t + 2, out, fn, t[0], b ) )
return( -1 ); return( -1 );
return( 0 ); return( 0 );

2
libvips/include/vips/internal.h
View File

@ -135,7 +135,7 @@ int im__bandup( IMAGE *in, IMAGE *out, int n );
int im__arith_binary( const char *name, int im__arith_binary( const char *name,
IMAGE *in1, IMAGE *in2, IMAGE *out, IMAGE *in1, IMAGE *in2, IMAGE *out,
int format_table[10], int format_table[10],
im_wrapmany_fn fn, void *a ); im_wrapmany_fn fn, void *b );
int im__arith_binary_const( const char *name, int im__arith_binary_const( const char *name,
IMAGE *in, IMAGE *out, int n, double *c, IMAGE *in, IMAGE *out, int n, double *c,
int format_table[10], int format_table[10],