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

better cache sizing for pdfload and svgload

Browse Source
This commit is contained in:
John Cupitt 2016-02-10 09:20:28 +00:00
parent 77b8eaf653
commit a037346093
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libvips/foreign/pdfload.c
View File

@ -236,7 +236,13 @@ vips_foreign_load_pdf_generate( VipsRegion *or,
cairo_t *cr;
int x, y;
/* Pdf won't always paint the background.
/*
printf( "vips_foreign_load_pdf_generate: "
"left = %d, top = %d, width = %d, height = %d\n",
r->left, r->top, r->width, r->height );
*/
/* Poppler won't always paint the background.
*/
vips_region_black( or );
@ -283,6 +289,15 @@ vips_foreign_load_pdf_load( VipsForeignLoad *load )
VipsImage **t = (VipsImage **)
vips_object_local_array( (VipsObject *) load, 2 );
int tile_width;
int tile_height;
int n_lines;
/* Use this to pick a tile height for our strip cache.
*/
vips_get_tile_size( load->real,
&tile_width, &tile_height, &n_lines );
/* Read to this image, then cache to out, see below.
*/
t[0] = vips_image_new();
@ -297,7 +312,7 @@ vips_foreign_load_pdf_load( VipsForeignLoad *load )
* locking to keep pdf single-threaded.
*/
if( vips_linecache( t[0], &t[1],
"tile_height", 128,
"tile_height", tile_height,
NULL ) )
return( -1 );
if( vips_image_write( t[1], load->real ) )

15
libvips/foreign/svgload.c
View File

@ -208,6 +208,15 @@ vips_foreign_load_svg_load( VipsForeignLoad *load )
VipsImage **t = (VipsImage **)
vips_object_local_array( (VipsObject *) load, 2 );
int tile_width;
int tile_height;
int n_lines;
/* Use this to pick a tile height for our strip cache.
*/
vips_get_tile_size( load->real,
&tile_width, &tile_height, &n_lines );
/* Read to this image, then cache to out, see below.
*/
t[0] = vips_image_new();
@ -218,11 +227,11 @@ vips_foreign_load_svg_load( VipsForeignLoad *load )
return( -1 );
/* Don't use tilecache to keep the number of calls to
* svg_page_render() low. Don't thread the cache, we rely on
* locking to keep svg single-threaded.
* rsvg_handle_render_cairo() low. Don't thread the cache, we rely on
* locking to keep rsvg single-threaded.
*/
if( vips_linecache( t[0], &t[1],
"tile_height", 128,
"tile_height", tile_height,
NULL ) )
return( -1 );
if( vips_image_write( t[1], load->real ) )