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

Merge remote-tracking branch 'origin/7.30'

Browse Source 
Conflicts:
	libvips/conversion/tilecache.c
This commit is contained in:
John Cupitt 2012-11-15 12:06:03 +00:00
commit 1f42132d8b
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -23,6 +23,7 @@
- remove options from format string in .dzi (thanks Martin) - remove options from format string in .dzi (thanks Martin)
- vipsCC.pc required the wrong version of vips (thanks Alessandro) - vipsCC.pc required the wrong version of vips (thanks Alessandro)
- larger max tile size for dzsave - larger max tile size for dzsave
- linecache is 50% larger to leave some slop room
13/9/12 started 7.30.3 13/9/12 started 7.30.3
- linecache sized itself too large - linecache sized itself too large

7
libvips/conversion/tilecache.c
View File

@ -21,6 +21,8 @@
* - use a hash table instead of a list * - use a hash table instead of a list
* 13/9/12 * 13/9/12
* - oops, linecache was oversized * - oops, linecache was oversized
* 12/11/12
* - make linecache 50% larger to give some slop room
* 8/10/12 * 8/10/12
* - make it optionally threaded * - make it optionally threaded
*/ */
@ -849,13 +851,14 @@ vips_line_cache_build( VipsObject *object )
*/ */
block_cache->tile_width = block_cache->in->Xsize; block_cache->tile_width = block_cache->in->Xsize;
/* Enough lines for two complete buffers. /* Enough lines for two complete buffers would be exactly right. Make
* it 3 to give us some slop room.
* *
* This can go up with request size, see vips_line_cache_gen(). * This can go up with request size, see vips_line_cache_gen().
*/ */
vips_get_tile_size( block_cache->in, vips_get_tile_size( block_cache->in,
&tile_width, &tile_height, &nlines ); &tile_width, &tile_height, &nlines );
block_cache->max_tiles = 2 * (1 + nlines / block_cache->tile_height); block_cache->max_tiles = 3 * (1 + nlines / block_cache->tile_height);
VIPS_DEBUG_MSG( "vips_line_cache_build: max_tiles = %d, " VIPS_DEBUG_MSG( "vips_line_cache_build: max_tiles = %d, "
"tile_height = %d\n", "tile_height = %d\n",