allow smaller rowsperstrip

and some other tiny things
This commit is contained in:
John Cupitt 2015-12-13 14:55:56 +00:00
parent ff1dd39432
commit 1593b23fc4
4 changed files with 11 additions and 15 deletions

6
TODO
View File

@ -1,9 +1,3 @@
- add tests for vips_arrayjoin()
and valgrind it too
could crop before we pad, perhaps? we could nest two embeds, that might be
simpler
- get some brightly coloured spots with nohalo / vsqbs on wobble.ws ... very - get some brightly coloured spots with nohalo / vsqbs on wobble.ws ... very
odd, the interpolation shouldn't change between bands odd, the interpolation shouldn't change between bands

View File

@ -357,9 +357,6 @@ vips_embed_build( VipsObject *object )
embed->height == embed->in->Ysize ) embed->height == embed->in->Ysize )
return( vips_image_write( embed->in, conversion->out ) ); return( vips_image_write( embed->in, conversion->out ) );
if( vips_image_pio_input( embed->in ) )
return( -1 );
if( !(embed->ink = vips__vector_to_ink( if( !(embed->ink = vips__vector_to_ink(
class->nickname, embed->in, class->nickname, embed->in,
VIPS_AREA( embed->background )->data, NULL, VIPS_AREA( embed->background )->data, NULL,

View File

@ -2042,7 +2042,7 @@ vips__tiff_read_buffer( const void *buf, size_t len,
#ifdef DEBUG #ifdef DEBUG
printf( "tiff2vips: libtiff version is \"%s\"\n", TIFFGetVersion() ); printf( "tiff2vips: libtiff version is \"%s\"\n", TIFFGetVersion() );
printf( "tiff2vips: libtiff starting for %s\n", filename ); printf( "tiff2vips: libtiff starting for buffer %p\n", buf );
#endif /*DEBUG*/ #endif /*DEBUG*/
vips__tiff_init(); vips__tiff_init();

View File

@ -857,11 +857,16 @@ write_new( VipsImage *im, const char *filename,
write->xres = xres; write->xres = xres;
write->yres = yres; write->yres = yres;
if( (write->tilew & 0xf) != 0 || /* In strip mode we use tileh to set rowsperstrip, and that does not
(write->tileh & 0xf) != 0 ) { * have the multiple-of-16 restriction.
vips_error( "vips2tiff", */
"%s", _( "tile size not a multiple of 16" ) ); if( tile ) {
return( NULL ); if( (write->tilew & 0xf) != 0 ||
(write->tileh & 0xf) != 0 ) {
vips_error( "vips2tiff",
"%s", _( "tile size not a multiple of 16" ) );
return( NULL );
}
} }
/* We can only pyramid LABQ and non-complex images. /* We can only pyramid LABQ and non-complex images.