Merge branch 'master' of github.com:libvips/libvips

This commit is contained in:
John Cupitt 2021-10-29 19:05:40 +01:00
commit 5f101b4f2e
2 changed files with 10 additions and 9 deletions

View File

@ -491,7 +491,7 @@ typedef enum {
} VipsForeignTiffCompression;
/**
* VipsForeignTiffPoor:
* VipsForeignTiffPredictor:
* @VIPS_FOREIGN_TIFF_PREDICTOR_NONE: no prediction
* @VIPS_FOREIGN_TIFF_PREDICTOR_HORIZONTAL: horizontal differencing
* @VIPS_FOREIGN_TIFF_PREDICTOR_FLOAT: float predictor
@ -614,20 +614,20 @@ int vips_pngsave_buffer( VipsImage *in, void **buf, size_t *len, ... )
/**
* VipsForeignPpmFormat:
* @VIPS_FOREIGN_PPM_PBM: portable bitmap
* @VIPS_FOREIGN_PPM_PGM: portable greymap
* @VIPS_FOREIGN_PPM_PPM: portable pixmap
* @VIPS_FOREIGN_PPM_PFM: portable float map
* @VIPS_FOREIGN_PPM_FORMAT_PBM: portable bitmap
* @VIPS_FOREIGN_PPM_FORMAT_PGM: portable greymap
* @VIPS_FOREIGN_PPM_FORMAT_PPM: portable pixmap
* @VIPS_FOREIGN_PPM_FORMAT_PFM: portable float map
*
* The netpbm file format to save as.
*
* #VIPS_FOREIGN_PPM_PBM images are single bit.
* #VIPS_FOREIGN_PPM_FORMAT_PBM images are single bit.
*
* #VIPS_FOREIGN_PPM_PGB images are 8, 16, or 32-bits, one band.
* #VIPS_FOREIGN_PPM_FORMAT_PGM images are 8, 16, or 32-bits, one band.
*
* #VIPS_FOREIGN_PPM_PPM images are 8, 16, or 32-bits, three bands.
* #VIPS_FOREIGN_PPM_FORMAT_PPM images are 8, 16, or 32-bits, three bands.
*
* #VIPS_FOREIGN_PPM_PFM images are 32-bit float pixels.
* #VIPS_FOREIGN_PPM_FORMAT_PFM images are 32-bit float pixels.
*/
typedef enum {
VIPS_FOREIGN_PPM_FORMAT_PBM,

View File

@ -61,6 +61,7 @@
* @VIPS_KERNEL_NEAREST: The nearest pixel to the point.
* @VIPS_KERNEL_LINEAR: Convolve with a triangle filter.
* @VIPS_KERNEL_CUBIC: Convolve with a cubic filter.
* @VIPS_KERNEL_MITCHELL: Convolve with a Mitchell kernel.
* @VIPS_KERNEL_LANCZOS2: Convolve with a two-lobe Lanczos kernel.
* @VIPS_KERNEL_LANCZOS3: Convolve with a three-lobe Lanczos kernel.
*