This commit is contained in:
John Cupitt 2012-06-14 09:31:05 +01:00
parent a2c37d10f0
commit 021ba9a01c
4 changed files with 17 additions and 3 deletions

5
TODO
View File

@ -18,6 +18,11 @@ sys 0m0.136s
is the real time difference just due to smalltile vs. thinstrip? is the real time difference just due to smalltile vs. thinstrip?
can we trick vipsthumbnail into using fatstrip?
- vipsthumbnail a tif with an embedded profile ... don't seem to get a profile
in the jpg?
blocking bugs blocking bugs

View File

@ -401,8 +401,13 @@ vips_embed_build( VipsObject *object )
case VIPS_EXTEND_COPY: case VIPS_EXTEND_COPY:
if( vips_image_copy_fields( conversion->out, embed->in ) ) if( vips_image_copy_fields( conversion->out, embed->in ) )
return( -1 ); return( -1 );
/* embed is used in many places. SMALLTILE would force most
* pipelines into SMALLTILE mode, so stick with THINSTRIP,
* even though SMALLTILE might be a little faster for us.
*/
vips_demand_hint( conversion->out, vips_demand_hint( conversion->out,
VIPS_DEMAND_STYLE_SMALLTILE, embed->in, NULL ); VIPS_DEMAND_STYLE_FATSTRIP, embed->in, NULL );
conversion->out->Xsize = embed->width; conversion->out->Xsize = embed->width;
conversion->out->Ysize = embed->height; conversion->out->Ysize = embed->height;

View File

@ -34,8 +34,8 @@
*/ */
/* /*
#define VIPS_DEBUG
*/ */
#define VIPS_DEBUG
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
@ -79,7 +79,7 @@ vips_sequential_generate( VipsRegion *or,
*/ */
if( r->top != sequential->y_pos ) { if( r->top != sequential->y_pos ) {
printf( "vips_sequential_generate: error -- " printf( "vips_sequential_generate: error -- "
"at position %d in file, but position %d requested", "at position %d in file, but position %d requested\n",
sequential->y_pos, r->top ); sequential->y_pos, r->top );
vips_error( "VipsSequential", vips_error( "VipsSequential",

View File

@ -1621,6 +1621,10 @@ vips_image_write_gen( VipsRegion *or,
VipsRegion *ir = (VipsRegion *) seq; VipsRegion *ir = (VipsRegion *) seq;
VipsRect *r = &or->valid; VipsRect *r = &or->valid;
printf( "vips_image_write_gen: "
"left = %d, top = %d, width = %d, height = %d\n",
r->left, r->top, r->width, r->height );
/* Copy with pointers. /* Copy with pointers.
*/ */
if( vips_region_prepare( ir, r ) || if( vips_region_prepare( ir, r ) ||