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

Merge branch 'master' of github.com:jcupitt/libvips

Browse Source
This commit is contained in:
John Cupitt 2017-05-29 18:59:13 +01:00
commit 3f69762163
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libvips/resample/reduceh.cpp
View File

@ -506,12 +506,12 @@ vips_reduceh_build( VipsObject *object )
reduceh->n_point / 2 - 1, 0, reduceh->n_point / 2 - 1, 0,
width, in->Ysize, width, in->Ysize,
"extend", VIPS_EXTEND_COPY, "extend", VIPS_EXTEND_COPY,
NULL ) ) (void *) NULL ) )
return( -1 ); return( -1 );
in = t[1]; in = t[1];
if( vips_image_pipelinev( resample->out, if( vips_image_pipelinev( resample->out,
VIPS_DEMAND_STYLE_THINSTRIP, in, NULL ) ) VIPS_DEMAND_STYLE_THINSTRIP, in, (void *) NULL ) )
return( -1 ); return( -1 );
/* Size output. We need to always round to nearest, so round(), not /* Size output. We need to always round to nearest, so round(), not

6
libvips/resample/reducev.cpp
View File

@ -787,7 +787,7 @@ vips_reducev_raw( VipsReducev *reducev, VipsImage *in, VipsImage **out )
*out = vips_image_new(); *out = vips_image_new();
if( vips_image_pipelinev( *out, if( vips_image_pipelinev( *out,
VIPS_DEMAND_STYLE_FATSTRIP, in, NULL ) ) VIPS_DEMAND_STYLE_FATSTRIP, in, (void *) NULL ) )
return( -1 ); return( -1 );
/* Size output. We need to always round to nearest, so round(), not /* Size output. We need to always round to nearest, so round(), not
@ -870,7 +870,7 @@ vips_reducev_build( VipsObject *object )
0, reducev->n_point / 2 - 1, 0, reducev->n_point / 2 - 1,
in->Xsize, height, in->Xsize, height,
"extend", VIPS_EXTEND_COPY, "extend", VIPS_EXTEND_COPY,
NULL ) ) (void *) NULL ) )
return( -1 ); return( -1 );
in = t[1]; in = t[1];
@ -894,7 +894,7 @@ vips_reducev_build( VipsObject *object )
if( vips_sequential( in, &t[3], if( vips_sequential( in, &t[3],
"tile_height", 10, "tile_height", 10,
// "trace", TRUE, // "trace", TRUE,
NULL ) ) (void *) NULL ) )
return( -1 ); return( -1 );
in = t[3]; in = t[3];
} }