@img/sharp-libvips-dev 1.1.0 → 1.2.0-rc.1

package/include/vips/VImage8.h

@@ -2082,6 +2082,7 @@ public:
 
 	// headers for vips operations
 	// this file is generated automatically, do not edit!
+	// clang-format off
 
 	/**
 	 * Transform lch to cmc.
@@ -3276,6 +3277,7 @@ public:
 	 *   - **reuse** -- Reuse palette from input, bool.
 	 *   - **interpalette_maxerror** -- Maximum inter-palette error for palette reusage, double.
 	 *   - **interlace** -- Generate an interlaced (progressive) GIF, bool.
+	 *   - **keep_duplicate_frames** -- Keep duplicate frames in the output instead of combining them, bool.
 	 *   - **keep** -- Which metadata to retain, VipsForeignKeep.
 	 *   - **background** -- Background value, std::vector<double>.
 	 *   - **page_height** -- Set page height for multipage save, int.
@@ -3297,6 +3299,7 @@ public:
 	 *   - **reuse** -- Reuse palette from input, bool.
 	 *   - **interpalette_maxerror** -- Maximum inter-palette error for palette reusage, double.
 	 *   - **interlace** -- Generate an interlaced (progressive) GIF, bool.
+	 *   - **keep_duplicate_frames** -- Keep duplicate frames in the output instead of combining them, bool.
 	 *   - **keep** -- Which metadata to retain, VipsForeignKeep.
 	 *   - **background** -- Background value, std::vector<double>.
 	 *   - **page_height** -- Set page height for multipage save, int.
@@ -3318,6 +3321,7 @@ public:
 	 *   - **reuse** -- Reuse palette from input, bool.
 	 *   - **interpalette_maxerror** -- Maximum inter-palette error for palette reusage, double.
 	 *   - **interlace** -- Generate an interlaced (progressive) GIF, bool.
+	 *   - **keep_duplicate_frames** -- Keep duplicate frames in the output instead of combining them, bool.
 	 *   - **keep** -- Which metadata to retain, VipsForeignKeep.
 	 *   - **background** -- Background value, std::vector<double>.
 	 *   - **page_height** -- Set page height for multipage save, int.
@@ -3762,6 +3766,7 @@ public:
 	 *
 	 * **Optional parameters**
 	 *   - **page** -- Load this page from the image, int.
+	 *   - **oneshot** -- Load images a frame at a time, bool.
 	 *   - **memory** -- Force open via memory, bool.
 	 *   - **access** -- Required access pattern for this file, VipsAccess.
 	 *   - **fail_on** -- Error level to fail on, VipsFailOn.
@@ -3778,6 +3783,7 @@ public:
 	 *
 	 * **Optional parameters**
 	 *   - **page** -- Load this page from the image, int.
+	 *   - **oneshot** -- Load images a frame at a time, bool.
 	 *   - **memory** -- Force open via memory, bool.
 	 *   - **access** -- Required access pattern for this file, VipsAccess.
 	 *   - **fail_on** -- Error level to fail on, VipsFailOn.
@@ -3794,6 +3800,7 @@ public:
 	 *
 	 * **Optional parameters**
 	 *   - **page** -- Load this page from the image, int.
+	 *   - **oneshot** -- Load images a frame at a time, bool.
 	 *   - **memory** -- Force open via memory, bool.
 	 *   - **access** -- Required access pattern for this file, VipsAccess.
 	 *   - **fail_on** -- Error level to fail on, VipsFailOn.
@@ -4517,7 +4524,7 @@ public:
 	static VImage matload(const char *filename, VOption *options = nullptr);
 
 	/**
-	 * Invert an matrix.
+	 * Invert a matrix.
 	 * @param options Set of options.
 	 * @return Output matrix.
 	 */
@@ -4553,6 +4560,14 @@ public:
 	 */
 	static VImage matrixload_source(VSource source, VOption *options = nullptr);
 
+	/**
+	 * Multiply two matrices.
+	 * @param right Second matrix to multiply.
+	 * @param options Set of options.
+	 * @return Output matrix.
+	 */
+	VImage matrixmultiply(VImage right, VOption *options = nullptr) const;
+
 	/**
 	 * Print matrix.
 	 *
@@ -5059,7 +5074,22 @@ public:
 	static VImage ppmload(const char *filename, VOption *options = nullptr);
 
 	/**
-	 * Load ppm base class.
+	 * Load ppm from buffer.
+	 *
+	 * **Optional parameters**
+	 *   - **memory** -- Force open via memory, bool.
+	 *   - **access** -- Required access pattern for this file, VipsAccess.
+	 *   - **fail_on** -- Error level to fail on, VipsFailOn.
+	 *   - **revalidate** -- Don't use a cached result for this operation, bool.
+	 *
+	 * @param buffer Buffer to load from.
+	 * @param options Set of options.
+	 * @return Output image.
+	 */
+	static VImage ppmload_buffer(VipsBlob *buffer, VOption *options = nullptr);
+
+	/**
+	 * Load ppm from source.
 	 *
 	 * **Optional parameters**
 	 *   - **memory** -- Force open via memory, bool.
@@ -5410,6 +5440,15 @@ public:
 	 */
 	VImage remainder_const(std::vector<double> c, VOption *options = nullptr) const;
 
+	/**
+	 * Rebuild an mosaiced image.
+	 * @param old_str Search for this string.
+	 * @param new_str And swap for this string.
+	 * @param options Set of options.
+	 * @return Output image.
+	 */
+	VImage remosaic(const char *old_str, const char *new_str, VOption *options = nullptr) const;
+
 	/**
 	 * Replicate an image.
 	 * @param across Repeat this many times horizontally.
@@ -5510,7 +5549,7 @@ public:
 	VImage scRGB2XYZ(VOption *options = nullptr) const;
 
 	/**
-	 * Convert an scrgb image to srgb.
+	 * Convert scrgb to srgb.
 	 *
 	 * **Optional parameters**
 	 *   - **depth** -- Output device space depth in bits, int.
@@ -5755,6 +5794,8 @@ public:
 	 *   - **dpi** -- Render at this DPI, double.
 	 *   - **scale** -- Scale output by this factor, double.
 	 *   - **unlimited** -- Allow SVG of any size, bool.
+	 *   - **stylesheet** -- Custom CSS, const char *.
+	 *   - **high_bitdepth** -- Enable scRGB 128-bit output (32-bit per channel), bool.
 	 *   - **memory** -- Force open via memory, bool.
 	 *   - **access** -- Required access pattern for this file, VipsAccess.
 	 *   - **fail_on** -- Error level to fail on, VipsFailOn.
@@ -5773,6 +5814,8 @@ public:
 	 *   - **dpi** -- Render at this DPI, double.
 	 *   - **scale** -- Scale output by this factor, double.
 	 *   - **unlimited** -- Allow SVG of any size, bool.
+	 *   - **stylesheet** -- Custom CSS, const char *.
+	 *   - **high_bitdepth** -- Enable scRGB 128-bit output (32-bit per channel), bool.
 	 *   - **memory** -- Force open via memory, bool.
 	 *   - **access** -- Required access pattern for this file, VipsAccess.
 	 *   - **fail_on** -- Error level to fail on, VipsFailOn.
@@ -5791,6 +5834,8 @@ public:
 	 *   - **dpi** -- Render at this DPI, double.
 	 *   - **scale** -- Scale output by this factor, double.
 	 *   - **unlimited** -- Allow SVG of any size, bool.
+	 *   - **stylesheet** -- Custom CSS, const char *.
+	 *   - **high_bitdepth** -- Enable scRGB 128-bit output (32-bit per channel), bool.
 	 *   - **memory** -- Force open via memory, bool.
 	 *   - **access** -- Required access pattern for this file, VipsAccess.
 	 *   - **fail_on** -- Error level to fail on, VipsFailOn.
@@ -5853,8 +5898,8 @@ public:
 	 *   - **no_rotate** -- Don't use orientation tags to rotate image upright, bool.
 	 *   - **crop** -- Reduce to fill target rectangle, then crop, VipsInteresting.
 	 *   - **linear** -- Reduce in linear light, bool.
-	 *   - **import_profile** -- Fallback import profile, const char *.
-	 *   - **export_profile** -- Fallback export profile, const char *.
+	 *   - **input_profile** -- Fallback input profile, const char *.
+	 *   - **output_profile** -- Fallback output profile, const char *.
 	 *   - **intent** -- Rendering intent, VipsIntent.
 	 *   - **fail_on** -- Error level to fail on, VipsFailOn.
 	 *
@@ -5875,8 +5920,8 @@ public:
 	 *   - **no_rotate** -- Don't use orientation tags to rotate image upright, bool.
 	 *   - **crop** -- Reduce to fill target rectangle, then crop, VipsInteresting.
 	 *   - **linear** -- Reduce in linear light, bool.
-	 *   - **import_profile** -- Fallback import profile, const char *.
-	 *   - **export_profile** -- Fallback export profile, const char *.
+	 *   - **input_profile** -- Fallback input profile, const char *.
+	 *   - **output_profile** -- Fallback output profile, const char *.
 	 *   - **intent** -- Rendering intent, VipsIntent.
 	 *   - **fail_on** -- Error level to fail on, VipsFailOn.
 	 *
@@ -5896,8 +5941,8 @@ public:
 	 *   - **no_rotate** -- Don't use orientation tags to rotate image upright, bool.
 	 *   - **crop** -- Reduce to fill target rectangle, then crop, VipsInteresting.
 	 *   - **linear** -- Reduce in linear light, bool.
-	 *   - **import_profile** -- Fallback import profile, const char *.
-	 *   - **export_profile** -- Fallback export profile, const char *.
+	 *   - **input_profile** -- Fallback input profile, const char *.
+	 *   - **output_profile** -- Fallback output profile, const char *.
 	 *   - **intent** -- Rendering intent, VipsIntent.
 	 *   - **fail_on** -- Error level to fail on, VipsFailOn.
 	 *
@@ -5917,8 +5962,8 @@ public:
 	 *   - **no_rotate** -- Don't use orientation tags to rotate image upright, bool.
 	 *   - **crop** -- Reduce to fill target rectangle, then crop, VipsInteresting.
 	 *   - **linear** -- Reduce in linear light, bool.
-	 *   - **import_profile** -- Fallback import profile, const char *.
-	 *   - **export_profile** -- Fallback export profile, const char *.
+	 *   - **input_profile** -- Fallback input profile, const char *.
+	 *   - **output_profile** -- Fallback output profile, const char *.
 	 *   - **intent** -- Rendering intent, VipsIntent.
 	 *   - **fail_on** -- Error level to fail on, VipsFailOn.
 	 *
@@ -5934,9 +5979,10 @@ public:
 	 *
 	 * **Optional parameters**
 	 *   - **page** -- First page to load, int.
-	 *   - **subifd** -- Subifd index, int.
 	 *   - **n** -- Number of pages to load, -1 for all, int.
 	 *   - **autorotate** -- Rotate image using orientation tag, bool.
+	 *   - **subifd** -- Subifd index, int.
+	 *   - **unlimited** -- Remove all denial of service limits, bool.
 	 *   - **memory** -- Force open via memory, bool.
 	 *   - **access** -- Required access pattern for this file, VipsAccess.
 	 *   - **fail_on** -- Error level to fail on, VipsFailOn.
@@ -5953,9 +5999,10 @@ public:
 	 *
 	 * **Optional parameters**
 	 *   - **page** -- First page to load, int.
-	 *   - **subifd** -- Subifd index, int.
 	 *   - **n** -- Number of pages to load, -1 for all, int.
 	 *   - **autorotate** -- Rotate image using orientation tag, bool.
+	 *   - **subifd** -- Subifd index, int.
+	 *   - **unlimited** -- Remove all denial of service limits, bool.
 	 *   - **memory** -- Force open via memory, bool.
 	 *   - **access** -- Required access pattern for this file, VipsAccess.
 	 *   - **fail_on** -- Error level to fail on, VipsFailOn.
@@ -5972,9 +6019,10 @@ public:
 	 *
 	 * **Optional parameters**
 	 *   - **page** -- First page to load, int.
-	 *   - **subifd** -- Subifd index, int.
 	 *   - **n** -- Number of pages to load, -1 for all, int.
 	 *   - **autorotate** -- Rotate image using orientation tag, bool.
+	 *   - **subifd** -- Subifd index, int.
+	 *   - **unlimited** -- Remove all denial of service limits, bool.
 	 *   - **memory** -- Force open via memory, bool.
 	 *   - **access** -- Required access pattern for this file, VipsAccess.
 	 *   - **fail_on** -- Error level to fail on, VipsFailOn.

package/include/vips/arithmetic.h

@@ -43,24 +43,24 @@ extern "C" {
 
 /**
  * VipsOperationMath:
- * @VIPS_OPERATION_MATH_SIN: sin(), angles in degrees
- * @VIPS_OPERATION_MATH_COS: cos(), angles in degrees
- * @VIPS_OPERATION_MATH_TAN: tan(), angles in degrees
- * @VIPS_OPERATION_MATH_ASIN: asin(), angles in degrees
- * @VIPS_OPERATION_MATH_ACOS: acos(), angles in degrees
- * @VIPS_OPERATION_MATH_ATAN: atan(), angles in degrees
+ * @VIPS_OPERATION_MATH_SIN: `sin()`, angles in degrees
+ * @VIPS_OPERATION_MATH_COS: `cos()`, angles in degrees
+ * @VIPS_OPERATION_MATH_TAN: `tan()`, angles in degrees
+ * @VIPS_OPERATION_MATH_ASIN: `asin()`, angles in degrees
+ * @VIPS_OPERATION_MATH_ACOS: `acos()`, angles in degrees
+ * @VIPS_OPERATION_MATH_ATAN: `atan()`, angles in degrees
  * @VIPS_OPERATION_MATH_LOG: log base e
  * @VIPS_OPERATION_MATH_LOG10: log base 10
  * @VIPS_OPERATION_MATH_EXP: e to the something
  * @VIPS_OPERATION_MATH_EXP10: 10 to the something
- * @VIPS_OPERATION_MATH_SINH: sinh(), angles in radians
- * @VIPS_OPERATION_MATH_COSH: cosh(), angles in radians
- * @VIPS_OPERATION_MATH_TANH: tanh(), angles in radians
- * @VIPS_OPERATION_MATH_ASINH: asinh(), angles in radians
- * @VIPS_OPERATION_MATH_ACOSH: acosh(), angles in radians
- * @VIPS_OPERATION_MATH_ATANH: atanh(), angles in radians
+ * @VIPS_OPERATION_MATH_SINH: `sinh()`, angles in radians
+ * @VIPS_OPERATION_MATH_COSH: `cosh()`, angles in radians
+ * @VIPS_OPERATION_MATH_TANH: `tanh()`, angles in radians
+ * @VIPS_OPERATION_MATH_ASINH: `asinh()`, angles in radians
+ * @VIPS_OPERATION_MATH_ACOSH: `acosh()`, angles in radians
+ * @VIPS_OPERATION_MATH_ATANH: `atanh()`, angles in radians
  *
- * See also: vips_math().
+ * See also: [method@Image.math].
  */
 typedef enum {
 	VIPS_OPERATION_MATH_SIN,
@@ -84,11 +84,11 @@ typedef enum {
 
 /**
  * VipsOperationMath2:
- * @VIPS_OPERATION_MATH2_POW: pow(left, right)
- * @VIPS_OPERATION_MATH2_WOP: pow(right, left)
- * @VIPS_OPERATION_MATH2_ATAN2: atan2(left, right)
+ * @VIPS_OPERATION_MATH2_POW: `pow(left, right)`
+ * @VIPS_OPERATION_MATH2_WOP: `pow(right, left)`
+ * @VIPS_OPERATION_MATH2_ATAN2: `atan2(left, right)`
  *
- * See also: vips_math().
+ * See also: [method@Image.math].
  */
 typedef enum {
 	VIPS_OPERATION_MATH2_POW,
@@ -103,7 +103,7 @@ typedef enum {
  * @VIPS_OPERATION_ROUND_FLOOR: largest integral value not greater than
  * @VIPS_OPERATION_ROUND_CEIL: the smallest integral value not less than
  *
- * See also: vips_round().
+ * See also: [method@Image.round].
  */
 typedef enum {
 	VIPS_OPERATION_ROUND_RINT,
@@ -114,14 +114,14 @@ typedef enum {
 
 /**
  * VipsOperationRelational:
- * @VIPS_OPERATION_RELATIONAL_EQUAL: ==
- * @VIPS_OPERATION_RELATIONAL_NOTEQ: !=
- * @VIPS_OPERATION_RELATIONAL_LESS: <
- * @VIPS_OPERATION_RELATIONAL_LESSEQ: <=
- * @VIPS_OPERATION_RELATIONAL_MORE: >
- * @VIPS_OPERATION_RELATIONAL_MOREEQ: >=
+ * @VIPS_OPERATION_RELATIONAL_EQUAL: `==`
+ * @VIPS_OPERATION_RELATIONAL_NOTEQ: `!=`
+ * @VIPS_OPERATION_RELATIONAL_LESS: `<`
+ * @VIPS_OPERATION_RELATIONAL_LESSEQ: `<=`
+ * @VIPS_OPERATION_RELATIONAL_MORE: `>`
+ * @VIPS_OPERATION_RELATIONAL_MOREEQ: `>=`
  *
- * See also: vips_relational().
+ * See also: [method@Image.relational].
  */
 typedef enum {
 	VIPS_OPERATION_RELATIONAL_EQUAL,
@@ -135,13 +135,13 @@ typedef enum {
 
 /**
  * VipsOperationBoolean:
- * @VIPS_OPERATION_BOOLEAN_AND: &
- * @VIPS_OPERATION_BOOLEAN_OR: |
- * @VIPS_OPERATION_BOOLEAN_EOR: ^
- * @VIPS_OPERATION_BOOLEAN_LSHIFT: >>
- * @VIPS_OPERATION_BOOLEAN_RSHIFT: <<
+ * @VIPS_OPERATION_BOOLEAN_AND: `&`
+ * @VIPS_OPERATION_BOOLEAN_OR: `|`
+ * @VIPS_OPERATION_BOOLEAN_EOR: `^`
+ * @VIPS_OPERATION_BOOLEAN_LSHIFT: `>>`
+ * @VIPS_OPERATION_BOOLEAN_RSHIFT: `<<`
  *
- * See also: vips_boolean().
+ * See also: [method@Image.boolean].
  */
 typedef enum {
 	VIPS_OPERATION_BOOLEAN_AND,
@@ -158,7 +158,7 @@ typedef enum {
  * @VIPS_OPERATION_COMPLEX_RECT: convert to rectangular coordinates
  * @VIPS_OPERATION_COMPLEX_CONJ: complex conjugate
  *
- * See also: vips_complex().
+ * See also: [method@Image.complex].
  */
 typedef enum {
 	VIPS_OPERATION_COMPLEX_POLAR,
@@ -171,7 +171,7 @@ typedef enum {
  * VipsOperationComplex2:
  * @VIPS_OPERATION_COMPLEX2_CROSS_PHASE: convert to polar coordinates
  *
- * See also: vips_complex2().
+ * See also: [method@Image.complex2].
  */
 typedef enum {
 	VIPS_OPERATION_COMPLEX2_CROSS_PHASE,
@@ -183,7 +183,7 @@ typedef enum {
  * @VIPS_OPERATION_COMPLEXGET_REAL: get real component
  * @VIPS_OPERATION_COMPLEXGET_IMAG: get imaginary component
  *
- * See also: vips_complexget().
+ * See also: [method@Image.complexget].
  */
 typedef enum {
 	VIPS_OPERATION_COMPLEXGET_REAL,

package/include/vips/basic.h

@@ -56,6 +56,18 @@
 #define VIPS_DEPRECATED_FOR(f) G_DEPRECATED_FOR(f) VIPS_API
 #endif
 
+#if !defined(VIPS_DISABLE_DEPRECATION_WARNINGS) && \
+	(G_GNUC_CHECK_VERSION(4, 6) || \
+		__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 4))
+#define _VIPS_GNUC_DO_PRAGMA(x) _Pragma(G_STRINGIFY(x))
+#define VIPS_DEPRECATED_MACRO _VIPS_GNUC_DO_PRAGMA(GCC warning "Deprecated pre-processor symbol")
+#define VIPS_DEPRECATED_MACRO_FOR(f) \
+	_VIPS_GNUC_DO_PRAGMA(GCC warning G_STRINGIFY(Deprecated pre-processor symbol: replace with #f))
+#else
+#define VIPS_DEPRECATED_MACRO
+#define VIPS_DEPRECATED_MACRO_FOR(f)
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif /*__cplusplus*/
@@ -88,6 +100,8 @@ typedef enum {
 	VIPS_PRECISION_LAST
 } VipsPrecision;
 
+#ifndef __GI_SCANNER__
+
 /* Just for testing.
  */
 VIPS_API
@@ -95,6 +109,8 @@ char *vips_path_filename7(const char *path);
 VIPS_API
 char *vips_path_mode7(const char *path);
 
+#endif /* !__GI_SCANNER__ */
+
 struct _VipsImage;
 typedef struct _VipsImage VipsImage;
 struct _VipsRegion;

package/include/vips/buf.h

@@ -39,11 +39,6 @@
 extern "C" {
 #endif /*__cplusplus*/
 
-/* A string in the process of being written to ... multiple calls to
- * vips_buf_append add to it. On overflow append "..." and block further
- * writes.
- */
-
 struct _VipsBuf {
 	/* All fields are private.
 	 */

package/include/vips/colour.h

@@ -93,13 +93,18 @@ extern "C" {
 #define VIPS_D3250_Y0 (100.0)
 #define VIPS_D3250_Z0 (45.8501)
 
-/* Note: constants align with those defined in lcms2.h.
+/* Note: constants align with those defined in lcms2.h, except for
+ * VIPS_INTENT_AUTO, which is libvips-specific.
  */
 typedef enum {
 	VIPS_INTENT_PERCEPTUAL = 0,
 	VIPS_INTENT_RELATIVE,
 	VIPS_INTENT_SATURATION,
 	VIPS_INTENT_ABSOLUTE,
+	/* Leave room for possible new rendering intents beyond the
+	 * four standard ones.
+	 */
+	VIPS_INTENT_AUTO = 32,
 	VIPS_INTENT_LAST
 } VipsIntent;
 
@@ -144,12 +149,6 @@ VIPS_API
 int vips_Lab2LCh(VipsImage *in, VipsImage **out, ...)
 	G_GNUC_NULL_TERMINATED;
 VIPS_API
-int vips_Yxy2Lab(VipsImage *in, VipsImage **out, ...)
-	G_GNUC_NULL_TERMINATED;
-VIPS_API
-int vips_CMC2XYZ(VipsImage *in, VipsImage **out, ...)
-	G_GNUC_NULL_TERMINATED;
-VIPS_API
 int vips_Lab2XYZ(VipsImage *in, VipsImage **out, ...)
 	G_GNUC_NULL_TERMINATED;
 VIPS_API

package/include/vips/connection.h

@@ -58,8 +58,6 @@ extern "C" {
 	(G_TYPE_INSTANCE_GET_CLASS((obj), \
 		VIPS_TYPE_CONNECTION, VipsConnectionClass))
 
-/* Communicate with something like a socket or pipe.
- */
 typedef struct _VipsConnection {
 	VipsObject parent_object;
 
@@ -116,13 +114,6 @@ void vips_pipe_read_limit_set(gint64 limit);
 	(G_TYPE_INSTANCE_GET_CLASS((obj), \
 		VIPS_TYPE_SOURCE, VipsSourceClass))
 
-/* Read from something like a socket, file or memory area and present the data
- * with a unified seek / read / map interface.
- *
- * During the header phase, we save data from unseekable sources in a buffer
- * so readers can rewind and read again. We don't buffer data during the
- * decode stage.
- */
 struct _VipsSource {
 	VipsConnection parent_object;
 
@@ -194,14 +185,14 @@ typedef struct _VipsSourceClass {
 	 */
 
 	/* Read from the source into the supplied buffer, args exactly as
-	 * read(2). Set errno on error.
+	 * [`read()`](man:read(2)). Set errno on error.
 	 *
 	 * We must return gint64, since ssize_t is often defined as unsigned
 	 * on Windows.
 	 */
-	gint64 (*read)(VipsSource *, void *, size_t);
+	gint64 (*read)(VipsSource *source, void *buffer, size_t length);
 
-	/* Seek to a certain position, args exactly as lseek(2). Set errno on
+	/* Seek to a certain position, args exactly as [`lseek()`](man:lseek(2)). Set errno on
 	 * error.
 	 *
 	 * Unseekable sources should always return -1. VipsSource will then
@@ -210,7 +201,7 @@ typedef struct _VipsSourceClass {
 	 * We have to use int64 rather than off_t, since we must work on
 	 * Windows, where off_t can be 32-bits.
 	 */
-	gint64 (*seek)(VipsSource *, gint64, int);
+	gint64 (*seek)(VipsSource *source, gint64 offset, int whence);
 
 } VipsSourceClass;
 
@@ -226,7 +217,7 @@ VipsSource *vips_source_new_from_blob(VipsBlob *blob);
 VIPS_API
 VipsSource *vips_source_new_from_target(VipsTarget *target);
 VIPS_API
-VipsSource *vips_source_new_from_memory(const void *data, size_t size);
+VipsSource *vips_source_new_from_memory(const void *data, size_t length);
 VIPS_API
 VipsSource *vips_source_new_from_options(const char *options);
 
@@ -237,7 +228,7 @@ int vips_source_unminimise(VipsSource *source);
 VIPS_API
 int vips_source_decode(VipsSource *source);
 VIPS_API
-gint64 vips_source_read(VipsSource *source, void *data, size_t length);
+gint64 vips_source_read(VipsSource *source, void *buffer, size_t length);
 VIPS_API
 gboolean vips_source_is_mappable(VipsSource *source);
 VIPS_API
@@ -273,9 +264,6 @@ gint64 vips_source_length(VipsSource *source);
 	(G_TYPE_INSTANCE_GET_CLASS((obj), \
 		VIPS_TYPE_SOURCE_CUSTOM, VipsSourceCustomClass))
 
-/* Subclass of source_custom with signals for handlers. This is supposed to be
- * useful for language bindings.
- */
 typedef struct _VipsSourceCustom {
 	VipsSource parent_object;
 
@@ -288,8 +276,8 @@ typedef struct _VipsSourceCustomClass {
 	 * We must use gint64 everywhere since there's no G_TYPE_SIZE.
 	 */
 
-	gint64 (*read)(VipsSourceCustom *, void *, gint64);
-	gint64 (*seek)(VipsSourceCustom *, gint64, int);
+	gint64 (*read)(VipsSourceCustom *source, void *buffer, gint64 length);
+	gint64 (*seek)(VipsSourceCustom *source, gint64 offset, int whence);
 
 } VipsSourceCustomClass;
 
@@ -355,6 +343,10 @@ GInputStream *vips_g_input_stream_new_from_source(VipsSource *source);
 	(G_TYPE_INSTANCE_GET_CLASS((obj), \
 		VIPS_TYPE_SOURCE_G_INPUT_STREAM, VipsSourceGInputStreamClass))
 
+/**
+ * VipsSourceGInputStream: (copy-func g_object_ref)
+ *   (free-func g_object_unref)
+ */
 typedef struct _VipsSourceGInputStream {
 	VipsSource parent_instance;
 
@@ -396,8 +388,6 @@ VipsSourceGInputStream *vips_source_g_input_stream_new(GInputStream *stream);
  */
 #define VIPS_TARGET_BUFFER_SIZE (8500)
 
-/* Output to something like a socket, pipe or memory area.
- */
 struct _VipsTarget {
 	VipsConnection parent_object;
 
@@ -448,11 +438,11 @@ typedef struct _VipsTargetClass {
 	 * We must return gint64, since ssize_t is often defined as unsigned
 	 * on Windows.
 	 */
-	gint64 (*write)(VipsTarget *, const void *, size_t);
+	gint64 (*write)(VipsTarget *target, const void *data, size_t length);
 
 	/* Deprecated in favour of ::end.
 	 */
-	void (*finish)(VipsTarget *);
+	void (*finish)(VipsTarget *target);
 
 	/* libtiff needs to be able to seek and read on targets,
 	 * unfortunately.
@@ -461,24 +451,24 @@ typedef struct _VipsTargetClass {
 	 */
 
 	/* Read from the target into the supplied buffer, args exactly as
-	 * read(2). Set errno on error.
+	 * [`read()`](man:read(2)). Set errno on error.
 	 *
 	 * We must return gint64, since ssize_t is often defined as unsigned
 	 * on Windows.
 	 */
-	gint64 (*read)(VipsTarget *, void *, size_t);
+	gint64 (*read)(VipsTarget *target, void *buffer, size_t length);
 
-	/* Seek output. Args exactly as lseek(2).
+	/* Seek output. Args exactly as [`lseek()`](man:lseek(2)).
 	 *
 	 * We have to use int64 rather than off_t, since we must work on
 	 * Windows, where off_t can be 32-bits.
 	 */
-	gint64 (*seek)(VipsTarget *, gint64 offset, int whence);
+	gint64 (*seek)(VipsTarget *target, gint64 offset, int whence);
 
 	/* Output has been generated, so do any clearing up,
 	 * eg. copy the bytes we saved in memory to the target blob.
 	 */
-	int (*end)(VipsTarget *);
+	int (*end)(VipsTarget *target);
 
 } VipsTargetClass;
 
@@ -492,7 +482,7 @@ VipsTarget *vips_target_new_to_file(const char *filename);
 VIPS_API
 VipsTarget *vips_target_new_to_memory(void);
 VIPS_API
-VipsTarget *vips_target_new_temp(VipsTarget *target);
+VipsTarget *vips_target_new_temp(VipsTarget *based_on);
 VIPS_API
 int vips_target_write(VipsTarget *target, const void *data, size_t length);
 VIPS_API
@@ -537,8 +527,6 @@ int vips_target_write_amp(VipsTarget *target, const char *str);
 
 #define VIPS_TARGET_CUSTOM_BUFFER_SIZE (4096)
 
-/* Output to something like a socket, pipe or memory area.
- */
 typedef struct _VipsTargetCustom {
 	VipsTarget parent_object;
 
@@ -551,11 +539,11 @@ typedef struct _VipsTargetCustomClass {
 	 * We must use gint64 everywhere since there's no G_TYPE_SIZE.
 	 */
 
-	gint64 (*write)(VipsTargetCustom *, const void *, gint64);
-	void (*finish)(VipsTargetCustom *);
-	gint64 (*read)(VipsTargetCustom *, void *, gint64);
-	gint64 (*seek)(VipsTargetCustom *, gint64, int);
-	int (*end)(VipsTargetCustom *);
+	gint64 (*write)(VipsTargetCustom *target, const void *data, gint64 length);
+	void (*finish)(VipsTargetCustom *target);
+	gint64 (*read)(VipsTargetCustom *target, void *buffer, gint64 length);
+	gint64 (*seek)(VipsTargetCustom *target, gint64 offset, int whence);
+	int (*end)(VipsTargetCustom *target);
 
 } VipsTargetCustomClass;
 

package/include/vips/enumtypes.h

@@ -89,8 +89,11 @@ VIPS_API
 GType vips_fail_on_get_type(void) G_GNUC_CONST;
 #define VIPS_TYPE_FAIL_ON (vips_fail_on_get_type())
 VIPS_API
-GType vips_saveable_get_type(void) G_GNUC_CONST;
-#define VIPS_TYPE_SAVEABLE (vips_saveable_get_type())
+GType vips_foreign_saveable_get_type(void) G_GNUC_CONST;
+#define VIPS_TYPE_FOREIGN_SAVEABLE (vips_foreign_saveable_get_type())
+VIPS_API
+GType vips_foreign_coding_get_type(void) G_GNUC_CONST;
+#define VIPS_TYPE_FOREIGN_CODING (vips_foreign_coding_get_type())
 VIPS_API
 GType vips_foreign_keep_get_type(void) G_GNUC_CONST;
 #define VIPS_TYPE_FOREIGN_KEEP (vips_foreign_keep_get_type())
@@ -176,6 +179,12 @@ GType vips_size_get_type(void) G_GNUC_CONST;
 VIPS_API
 GType vips_token_get_type(void) G_GNUC_CONST;
 #define VIPS_TYPE_TOKEN (vips_token_get_type())
+/* Deprecated enumerations */
+#ifndef __GI_SCANNER__
+VIPS_API
+GType vips_saveable_get_type(void) G_GNUC_CONST;
+#define VIPS_TYPE_SAVEABLE (vips_saveable_get_type())
+#endif /*__GI_SCANNER__*/
 G_END_DECLS
 
 #endif /*VIPS_ENUM_TYPES_H*/