Merge branch '8.2'

This commit is contained in:
John Cupitt 2016-03-24 17:52:18 +00:00
commit 8a74609172
2 changed files with 6 additions and 3 deletions

View File

@ -568,7 +568,10 @@ vips_foreign_find_load_buffer_sub( VipsForeignLoadClass *load_class,
* memory buffer
* @size: number of bytes in @data
*
* Searches for an operation you could use to load a memory buffer.
* Searches for an operation you could use to load a memory buffer. To see the
* range of buffer loaders supported by your vips, try something like:
*
* vips -l | grep load_buffer
*
* See also: vips_image_new_from_buffer().
*

View File

@ -2113,8 +2113,8 @@ vips_image_new_from_memory_copy( const void *data, size_t size,
* @...: %NULL-terminated list of optional named arguments
*
* Loads an image from the formatted area of memory @buf, @len using the
* loader recommended by vips_foreign_find_load_buffer(). Only TIFF, PNG and
* JPEG formats are supported. To load an unformatted area of memory, use
* loader recommended by vips_foreign_find_load_buffer().
* To load an unformatted area of memory, use
* vips_image_new_from_memory().
*
* VIPS does not take