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

Avoid using unneeded variables

Browse Source
This commit is contained in:
Kleis Auke Wolthuizen 2020-06-18 14:40:29 +02:00
parent 597def2f77
commit f6b9f382ec
2 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libvips/convolution/convi.c
View File

@ -147,9 +147,6 @@ typedef struct {
typedef struct { typedef struct {
VipsConvolution parent_instance; VipsConvolution parent_instance;
/* An int version of M.
*/
VipsImage *iM;
int n_point; /* w * h for our matrix */ int n_point; /* w * h for our matrix */
/* We make a smaller version of the mask with the zeros squeezed out. /* We make a smaller version of the mask with the zeros squeezed out.
@ -853,7 +850,6 @@ vips__image_intize( VipsImage *in, VipsImage **out )
static int static int
vips_convi_intize( VipsConvi *convi, VipsImage *M ) vips_convi_intize( VipsConvi *convi, VipsImage *M )
{ {
int n_point;
VipsImage *t; VipsImage *t;
double scale; double scale;
double *scaled; double *scaled;
@ -862,21 +858,17 @@ vips_convi_intize( VipsConvi *convi, VipsImage *M )
int shift; int shift;
int i; int i;
n_point = M->Xsize * M->Ysize;
g_assert( convi->n_point == n_point );
if( vips_check_matrix( "vips2imask", M, &t ) ) if( vips_check_matrix( "vips2imask", M, &t ) )
return( -1 ); return( -1 );
/* Bake the scale into the mask to make a double version. /* Bake the scale into the mask to make a double version.
*/ */
scale = vips_image_get_scale( t ); scale = vips_image_get_scale( t );
if( !(scaled = VIPS_ARRAY( convi, n_point, double )) ) { if( !(scaled = VIPS_ARRAY( convi, convi->n_point, double )) ) {
g_object_unref( t ); g_object_unref( t );
return( -1 ); return( -1 );
} }
for( i = 0; i < n_point; i++ ) for( i = 0; i < convi->n_point; i++ )
scaled[i] = VIPS_MATRIX( t, 0, 0 )[i] / scale; scaled[i] = VIPS_MATRIX( t, 0, 0 )[i] / scale;
g_object_unref( t ); g_object_unref( t );
@ -896,7 +888,7 @@ vips_convi_intize( VipsConvi *convi, VipsImage *M )
mx = scaled[0]; mx = scaled[0];
mn = scaled[0]; mn = scaled[0];
for( i = 1; i < n_point; i++ ) { for( i = 1; i < convi->n_point; i++ ) {
if( scaled[i] > mx ) if( scaled[i] > mx )
mx = scaled[i]; mx = scaled[i];
if( scaled[i] < mn ) if( scaled[i] < mn )
@ -915,7 +907,7 @@ vips_convi_intize( VipsConvi *convi, VipsImage *M )
/* We need to sum n_points, so we have to shift right before adding a /* We need to sum n_points, so we have to shift right before adding a
* new value to make sure we have enough range. * new value to make sure we have enough range.
*/ */
convi->sexp = ceil( log2( n_point ) ); convi->sexp = ceil( log2( convi->n_point ) );
if( convi->sexp > 10 ) { if( convi->sexp > 10 ) {
g_info( "vips_convi_intize: mask too large" ); g_info( "vips_convi_intize: mask too large" );
return( -1 ); return( -1 );
@ -925,9 +917,9 @@ vips_convi_intize( VipsConvi *convi, VipsImage *M )
*/ */
convi->exp = 7 - shift - convi->sexp; convi->exp = 7 - shift - convi->sexp;
if( !(convi->mant = VIPS_ARRAY( convi, n_point, int )) ) if( !(convi->mant = VIPS_ARRAY( convi, convi->n_point, int )) )
return( -1 ); return( -1 );
for( i = 0; i < n_point; i++ ) { for( i = 0; i < convi->n_point; i++ ) {
/* 128 since this is signed. /* 128 since this is signed.
*/ */
convi->mant[i] = VIPS_RINT( 128 * scaled[i] * pow(2, -shift) ); convi->mant[i] = VIPS_RINT( 128 * scaled[i] * pow(2, -shift) );
@ -965,7 +957,7 @@ vips_convi_intize( VipsConvi *convi, VipsImage *M )
true_sum = 0.0; true_sum = 0.0;
int_sum = 0; int_sum = 0;
for( i = 0; i < n_point; i++ ) { for( i = 0; i < convi->n_point; i++ ) {
int value; int value;
true_sum += 128 * scaled[i]; true_sum += 128 * scaled[i];
@ -1001,7 +993,6 @@ vips_convi_build( VipsObject *object )
VipsImage *in; VipsImage *in;
VipsImage *M; VipsImage *M;
int n_point;
VipsGenerateFn generate; VipsGenerateFn generate;
double *coeff; double *coeff;
int i; int i;
@ -1047,19 +1038,18 @@ vips_convi_build( VipsObject *object )
*/ */
if( vips__image_intize( M, &t[1] ) ) if( vips__image_intize( M, &t[1] ) )
return( -1 ); return( -1 );
convi->iM = M = t[1]; M = t[1];
coeff = VIPS_MATRIX( M, 0, 0 ); coeff = VIPS_MATRIX( M, 0, 0 );
n_point = M->Xsize * M->Ysize; if( !(convi->coeff = VIPS_ARRAY( object, convi->n_point, int )) ||
if( !(convi->coeff = VIPS_ARRAY( object, n_point, int )) ||
!(convi->coeff_pos = !(convi->coeff_pos =
VIPS_ARRAY( object, n_point, int )) ) VIPS_ARRAY( object, convi->n_point, int )) )
return( -1 ); return( -1 );
/* Squeeze out zero mask elements. /* Squeeze out zero mask elements.
*/ */
convi->nnz = 0; convi->nnz = 0;
for( i = 0; i < n_point; i++ ) for( i = 0; i < convi->n_point; i++ )
if( coeff[i] ) { if( coeff[i] ) {
convi->coeff[convi->nnz] = coeff[i]; convi->coeff[convi->nnz] = coeff[i];
convi->coeff_pos[convi->nnz] = i; convi->coeff_pos[convi->nnz] = i;

8
libvips/resample/quadratic.c
View File

@ -241,7 +241,6 @@ vips_quadratic_build( VipsObject *object )
VipsResample *resample = VIPS_RESAMPLE( object ); VipsResample *resample = VIPS_RESAMPLE( object );
VipsQuadratic *quadratic = (VipsQuadratic *) object; VipsQuadratic *quadratic = (VipsQuadratic *) object;
VipsInterpolate *interpolate;
int window_size; int window_size;
int window_offset; int window_offset;
VipsImage *in; VipsImage *in;
@ -294,12 +293,11 @@ vips_quadratic_build( VipsObject *object )
return( -1 ); return( -1 );
} }
if( !vips_object_argument_isset( object, "interpolator" ) ) if( !quadratic->interpolate )
quadratic->interpolate = vips_interpolate_new( "bilinear" ); quadratic->interpolate = vips_interpolate_new( "bilinear" );
interpolate = quadratic->interpolate;
window_size = vips_interpolate_get_window_size( interpolate ); window_size = vips_interpolate_get_window_size( quadratic->interpolate );
window_offset = vips_interpolate_get_window_offset( interpolate ); window_offset = vips_interpolate_get_window_offset( quadratic->interpolate );
/* Enlarge the input image. /* Enlarge the input image.
*/ */