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

Merge remote-tracking branch 'origin/master' into hough

Browse Source 
Conflicts:
	ChangeLog
This commit is contained in:
John Cupitt 2014-04-01 12:50:08 +01:00
commit 052a73eb8e
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -16,9 +16,13 @@
- add vips_hough base class and vips_hough_line() - add vips_hough base class and vips_hough_line()
- add "mode" param to vips_draw_image() - add "mode" param to vips_draw_image()
- add vips_hough_circle() - add vips_hough_circle()
- reduce default cache size to 1,000 operations
6/3/14 started 7.38.6 6/3/14 started 7.38.6
- grey ramp minimum was wrong - grey ramp minimum was wrong
- vipsthumbnail --crop could fail for very non-square images, thanks
Alessandro
- fix a crash in vips_rawsave(), thanks Andrea
24/2/14 started 7.38.5 24/2/14 started 7.38.5
- jpeg load from buffer could write to input, thanks Lovell - jpeg load from buffer could write to input, thanks Lovell

2
libvips/foreign/rawsave.c
View File

@ -174,7 +174,7 @@ vips_rawsave( VipsImage *in, const char *filename, ... )
int result; int result;
va_start( ap, filename ); va_start( ap, filename );
result = vips_call_split( "rawsave", ap, filename ); result = vips_call_split( "rawsave", ap, in, filename );
va_end( ap ); va_end( ap );
return( result ); return( result );

8
libvips/iofuncs/cache.c
View File

@ -77,10 +77,12 @@ char *vips__cache_max_files = NULL;
gboolean vips__cache_dump = FALSE; gboolean vips__cache_dump = FALSE;
gboolean vips__cache_trace = FALSE; gboolean vips__cache_trace = FALSE;
/* Max number of cached operations. We are likely to trim due to memuse or /* Max number of cached operations.
* file use before we hit this limit. *
* It was 10,000, but this was too high for batch-style applications with
* little reuse.
*/ */
static int vips_cache_max = 10000; static int vips_cache_max = 1000;
/* How many tracked open files we allow before we start dropping cache. /* How many tracked open files we allow before we start dropping cache.
*/ */