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

package/include/vips/foreign.h

@@ -82,8 +82,6 @@ typedef struct _VipsForeignClass {
 
 } VipsForeignClass;
 
-/* Don't put spaces around void here, it breaks gtk-doc.
- */
 VIPS_API
 GType vips_foreign_get_type(void);
 
@@ -117,8 +115,8 @@ typedef enum /*< flags >*/ {
  * How sensitive loaders are to errors, from never stop (very insensitive), to
  * stop on the smallest warning (very sensitive).
  *
- * Each one implies the ones before it, so #VIPS_FAIL_ON_ERROR implies
- * #VIPS_FAIL_ON_TRUNCATED.
+ * Each one implies the ones before it, so [enum@Vips.FailOn.ERROR] implies
+ * [enum@Vips.FailOn.TRUNCATED].
  */
 typedef enum {
 	VIPS_FAIL_ON_NONE,
@@ -145,6 +143,7 @@ typedef enum {
 
 typedef struct _VipsForeignLoad {
 	VipsForeign parent_object;
+
 	/*< private >*/
 
 	/* Set TRUE to force open via memory.
@@ -201,11 +200,12 @@ typedef struct _VipsForeignLoad {
 
 typedef struct _VipsForeignLoadClass {
 	VipsForeignClass parent_class;
+
 	/*< public >*/
 
 	/* Is a file in this format.
 	 *
-	 * This function should return %TRUE if the file contains an image of
+	 * This function should return `TRUE` if the file contains an image of
 	 * this type. If you don't define this function, #VipsForeignLoad
 	 * will use @suffs instead.
 	 */
@@ -213,14 +213,14 @@ typedef struct _VipsForeignLoadClass {
 
 	/* Is a buffer in this format.
 	 *
-	 * This function should return %TRUE if the buffer contains an image of
+	 * This function should return `TRUE` if the buffer contains an image of
 	 * this type.
 	 */
 	gboolean (*is_a_buffer)(const void *data, size_t size);
 
 	/* Is a stream in this format.
 	 *
-	 * This function should return %TRUE if the stream contains an image of
+	 * This function should return `TRUE` if the stream contains an image of
 	 * this type.
 	 */
 	gboolean (*is_a_source)(VipsSource *source);
@@ -268,8 +268,6 @@ typedef struct _VipsForeignLoadClass {
 	int (*load)(VipsForeignLoad *load);
 } VipsForeignLoadClass;
 
-/* Don't put spaces around void here, it breaks gtk-doc.
- */
 VIPS_API
 GType vips_foreign_load_get_type(void);
 
@@ -310,25 +308,52 @@ void vips_foreign_load_invalidate(VipsImage *image);
 		VIPS_TYPE_FOREIGN_SAVE, VipsForeignSaveClass))
 
 /**
- * VipsSaveable:
- * @VIPS_SAVEABLE_MONO: 1 band (eg. CSV)
- * @VIPS_SAVEABLE_RGB: 1 or 3 bands (eg. PPM)
- * @VIPS_SAVEABLE_RGBA: 1, 2, 3 or 4 bands (eg. PNG)
- * @VIPS_SAVEABLE_RGBA_ONLY: 3 or 4 bands (eg. WEBP)
- * @VIPS_SAVEABLE_RGB_CMYK: 1, 3 or 4 bands (eg. JPEG)
- * @VIPS_SAVEABLE_ANY: any number of bands (eg. TIFF)
- *
- * See also: #VipsForeignSave.
+ * VipsForeignSaveable:
+ * @VIPS_FOREIGN_SAVEABLE_ANY: saver supports everything (eg. TIFF)
+ * @VIPS_FOREIGN_SAVEABLE_MONO: 1 band
+ * @VIPS_FOREIGN_SAVEABLE_RGB: 3 bands
+ * @VIPS_FOREIGN_SAVEABLE_CMYK: 4 bands
+ * @VIPS_FOREIGN_SAVEABLE_ALPHA: an extra band
+ *
+ * The set of image types supported by a saver.
+ *
+ * ::: seealso
+ *     [class@ForeignSave].
  */
-typedef enum {
-	VIPS_SAVEABLE_MONO,
-	VIPS_SAVEABLE_RGB,
-	VIPS_SAVEABLE_RGBA,
-	VIPS_SAVEABLE_RGBA_ONLY,
-	VIPS_SAVEABLE_RGB_CMYK,
-	VIPS_SAVEABLE_ANY,
-	VIPS_SAVEABLE_LAST
-} VipsSaveable;
+typedef enum /*< flags >*/ {
+	VIPS_FOREIGN_SAVEABLE_ANY = 0,
+	VIPS_FOREIGN_SAVEABLE_MONO = 1,
+	VIPS_FOREIGN_SAVEABLE_RGB = 2,
+	VIPS_FOREIGN_SAVEABLE_CMYK = 4,
+	VIPS_FOREIGN_SAVEABLE_ALPHA = 8,
+
+	VIPS_FOREIGN_SAVEABLE_ALL = (VIPS_FOREIGN_SAVEABLE_MONO |
+		VIPS_FOREIGN_SAVEABLE_RGB |
+		VIPS_FOREIGN_SAVEABLE_CMYK |
+		VIPS_FOREIGN_SAVEABLE_ALPHA)
+} VipsForeignSaveable;
+
+/**
+ * VipsForeignCoding:
+ * @VIPS_FOREIGN_CODING_NONE: saver supports [enum@Vips.Coding.NONE]
+ * @VIPS_FOREIGN_CODING_LABQ: saver supports [enum@Vips.Coding.LABQ]
+ * @VIPS_FOREIGN_CODING_RAD: saver supports [enum@Vips.Coding.RAD]
+ * @VIPS_FOREIGN_CODING_ALL: saver supports all coding types
+ *
+ * The set of coding types supported by a saver.
+ *
+ * ::: seealso
+ *     [enum@Coding].
+ */
+typedef enum /*< flags >*/ {
+	VIPS_FOREIGN_CODING_NONE = 1 << 0,
+	VIPS_FOREIGN_CODING_LABQ = 1 << 1,
+	VIPS_FOREIGN_CODING_RAD = 1 << 2,
+
+	VIPS_FOREIGN_CODING_ALL = (VIPS_FOREIGN_CODING_NONE |
+		VIPS_FOREIGN_CODING_LABQ |
+		VIPS_FOREIGN_CODING_RAD)
+} VipsForeignCoding;
 
 /**
  * VipsForeignKeep:
@@ -354,7 +379,7 @@ typedef enum /*< flags >*/ {
 		VIPS_FOREIGN_KEEP_XMP |
 		VIPS_FOREIGN_KEEP_IPTC |
 		VIPS_FOREIGN_KEEP_ICC |
-		VIPS_FOREIGN_KEEP_OTHER),
+		VIPS_FOREIGN_KEEP_OTHER)
 } VipsForeignKeep;
 
 typedef struct _VipsForeignSave {
@@ -403,11 +428,11 @@ typedef struct _VipsForeignSaveClass {
 
 	/* How this format treats bands.
 	 *
-	 * @saveable describes the bands that your saver can handle. For
+	 * @saveable describes the image types that your saver can handle. For
 	 * example, PPM images can have 1 or 3 bands (mono or RGB), so it
-	 * uses #VIPS_SAVEABLE_RGB.
+	 * uses [flags@Vips.ForeignSaveable.MONO] | [flags@Vips.ForeignSaveable.RGB].
 	 */
-	VipsSaveable saveable;
+	VipsForeignSaveable saveable;
 
 	/* How this format treats band formats.
 	 *
@@ -417,16 +442,15 @@ typedef struct _VipsForeignSaveClass {
 	 */
 	VipsBandFormat *format_table;
 
-	/* The set of coding types this format can save. For example, jpeg can
-	 * only save NONE, so has NONE TRUE and RAD and LABQ FALSE.
+	/* The set of coding types this format can save. For example,
+	 * [method@Image.vipssave] can save all coding types, so it
+	 * uses [flags@Vips.ForeignCoding.ALL]
 	 *
-	 * Default NONE TRUE, RAD and LABQ FALSE.
+	 * Default to [flags@Vips.ForeignCoding.NONE].
 	 */
-	gboolean coding[VIPS_CODING_LAST];
+	VipsForeignCoding coding;
 } VipsForeignSaveClass;
 
-/* Don't put spaces around void here, it breaks gtk-doc.
- */
 VIPS_API
 GType vips_foreign_save_get_type(void);
 
@@ -632,6 +656,9 @@ VIPS_API
 int vips_fitsload(const char *filename, VipsImage **out, ...)
 	G_GNUC_NULL_TERMINATED;
 VIPS_API
+int vips_fitsload_source(VipsSource *source, VipsImage **out, ...)
+	G_GNUC_NULL_TERMINATED;
+VIPS_API
 int vips_fitssave(VipsImage *in, const char *filename, ...)
 	G_GNUC_NULL_TERMINATED;
 
@@ -745,15 +772,15 @@ int vips_pngsave_buffer(VipsImage *in, void **buf, size_t *len, ...)
  *
  * The netpbm file format to save as.
  *
- * #VIPS_FOREIGN_PPM_FORMAT_PBM images are single bit.
+ * [enum@Vips.ForeignPpmFormat.PBM] images are single bit.
  *
- * #VIPS_FOREIGN_PPM_FORMAT_PGM images are 8, 16, or 32-bits, one band.
+ * [enum@Vips.ForeignPpmFormat.PGM] images are 8, 16, or 32-bits, one band.
  *
- * #VIPS_FOREIGN_PPM_FORMAT_PPM images are 8, 16, or 32-bits, three bands.
+ * [enum@Vips.ForeignPpmFormat.PPM] images are 8, 16, or 32-bits, three bands.
  *
- * #VIPS_FOREIGN_PPM_FORMAT_PFM images are 32-bit float pixels.
+ * [enum@Vips.ForeignPpmFormat.PFM] images are 32-bit float pixels.
  *
- * #VIPS_FOREIGN_PPM_FORMAT_PNM images are anymap images -- the image format
+ * [enum@Vips.ForeignPpmFormat.PNM] images are anymap images -- the image format
  * is used to pick the saver.
  *
  */
@@ -770,6 +797,9 @@ VIPS_API
 int vips_ppmload(const char *filename, VipsImage **out, ...)
 	G_GNUC_NULL_TERMINATED;
 VIPS_API
+int vips_ppmload_buffer(void *buf, size_t len, VipsImage **out, ...)
+	G_GNUC_NULL_TERMINATED;
+VIPS_API
 int vips_ppmload_source(VipsSource *source, VipsImage **out, ...)
 	G_GNUC_NULL_TERMINATED;
 VIPS_API
@@ -980,7 +1010,7 @@ int vips_dzsave_target(VipsImage *in, VipsTarget *target, ...)
  *
  * The compression format to use inside a HEIF container.
  *
- * This is assumed to use the same numbering as %heif_compression_format.
+ * This is assumed to use the same numbering as `heif_compression_format`.
  */
 typedef enum {
 	VIPS_FOREIGN_HEIF_COMPRESSION_HEVC = 1,

package/include/vips/format.h

@@ -64,6 +64,7 @@ typedef enum {
 
 typedef struct _VipsFormat {
 	VipsObject parent_object;
+
 	/*< public >*/
 
 } VipsFormat;
@@ -72,25 +73,26 @@ typedef struct _VipsFormatClass {
 	VipsObjectClass parent_class;
 
 	/*< public >*/
+
 	/* Is a file in this format.
 	 */
-	gboolean (*is_a)(const char *);
+	gboolean (*is_a)(const char *filename);
 
 	/* Read just the header into the VipsImage.
 	 */
-	int (*header)(const char *, VipsImage *);
+	int (*header)(const char *filename, VipsImage *image);
 
 	/* Load the whole image.
 	 */
-	int (*load)(const char *, VipsImage *);
+	int (*load)(const char *filename, VipsImage *image);
 
 	/* Write the VipsImage to the file in this format.
 	 */
-	int (*save)(VipsImage *, const char *);
+	int (*save)(VipsImage *image, const char *filename);
 
 	/* Get the flags for this file in this format.
 	 */
-	VipsFormatFlags (*get_flags)(const char *);
+	VipsFormatFlags (*get_flags)(const char *filename);
 
 	/* Loop over formats in this order, default 0. We need this because
 	 * some formats can be read by several loaders (eg. tiff can be read

package/include/vips/gate.h

@@ -69,20 +69,9 @@ extern "C" {
 	} \
 	G_STMT_END
 
-extern gboolean vips__thread_profile;
-
 VIPS_API
 void vips_profile_set(gboolean profile);
 
-void vips__thread_profile_attach(const char *thread_name);
-void vips__thread_profile_detach(void);
-void vips__thread_profile_stop(void);
-
-void vips__thread_gate_start(const char *gate_name);
-void vips__thread_gate_stop(const char *gate_name);
-
-void vips__thread_malloc_free(gint64 size);
-
 #endif /*VIPS_GATE_H*/
 
 #ifdef __cplusplus

package/include/vips/header.h

@@ -73,7 +73,7 @@ extern "C" {
  * The name we use to attach an ICC profile. The file read and write
  * operations for TIFF, JPEG, PNG and others use this item of metadata to
  * attach and save ICC profiles. The profile is updated by the
- * vips_icc_transform() operations.
+ * [method@Image.icc_transform] operations.
  */
 #define VIPS_META_ICC_NAME "icc-profile-data"
 
@@ -117,8 +117,8 @@ extern "C" {
 /**
  * VIPS_META_SEQUENTIAL:
  *
- * Images loaded via vips_sequential() have this int field defined. Some
- * operations (eg. vips_shrinkv()) add extra caches if they see it on their
+ * Images loaded via [method@Image.sequential] have this int field defined. Some
+ * operations (eg. [method@Image.shrinkv]) add extra caches if they see it on their
  * input.
  */
 #define VIPS_META_SEQUENTIAL "vips-sequential"
@@ -129,21 +129,21 @@ extern "C" {
  * The orientation tag for this image. An int from 1 - 8 using the standard
  * exif/tiff meanings.
  *
- * * 1 - The 0th row represents the visual top of the image, and the 0th column
+ * - 1 - The 0th row represents the visual top of the image, and the 0th column
  *   represents the visual left-hand side.
- * * 2 - The 0th row represents the visual top of the image, and the 0th column
+ * - 2 - The 0th row represents the visual top of the image, and the 0th column
  *   represents the visual right-hand side.
- * * 3 - The 0th row represents the visual bottom of the image, and the 0th
+ * - 3 - The 0th row represents the visual bottom of the image, and the 0th
  *   column represents the visual right-hand side.
- * * 4 - The 0th row represents the visual bottom of the image, and the 0th
+ * - 4 - The 0th row represents the visual bottom of the image, and the 0th
  *   column represents the visual left-hand side.
- * * 5 - The 0th row represents the visual left-hand side of the image, and the
+ * - 5 - The 0th row represents the visual left-hand side of the image, and the
  *   0th column represents the visual top.
- * * 6 - The 0th row represents the visual right-hand side of the image, and the
+ * - 6 - The 0th row represents the visual right-hand side of the image, and the
  *   0th column represents the visual top.
- * * 7 - The 0th row represents the visual right-hand side of the image, and the
+ * - 7 - The 0th row represents the visual right-hand side of the image, and the
  *   0th column represents the visual bottom.
- * * 8 - The 0th row represents the visual left-hand side of the image, and the
+ * - 8 - The 0th row represents the visual left-hand side of the image, and the
  *   0th column represents the visual bottom.
  */
 #define VIPS_META_ORIENTATION "orientation"

package/include/vips/image.h

@@ -252,7 +252,7 @@ struct _VipsImage {
 	VipsStopFn stop_fn;
 	void *client1; /* user arguments */
 	void *client2;
-	GMutex *sslock;		   /* start-stop lock */
+	GMutex sslock;		   /* start-stop lock */
 	GSList *regions;	   /* list of regions current for this image */
 	VipsDemandStyle dhint; /* demand style hint */
 
@@ -367,8 +367,6 @@ typedef struct _VipsImageClass {
 
 } VipsImageClass;
 
-/* Don't put spaces around void here, it breaks gtk-doc.
- */
 VIPS_API
 GType vips_image_get_type(void);
 
@@ -444,6 +442,13 @@ void vips_image_minimise_all(VipsImage *image);
 VIPS_API
 gboolean vips_image_is_sequential(VipsImage *image);
 
+VIPS_API
+void vips_image_preeval(VipsImage *image);
+VIPS_API
+void vips_image_eval(VipsImage *image, guint64 processed);
+VIPS_API
+void vips_image_posteval(VipsImage *image);
+
 VIPS_API
 void vips_image_set_progress(VipsImage *image, gboolean progress);
 VIPS_API

package/include/vips/interpolate.h

@@ -91,8 +91,6 @@ typedef struct _VipsInterpolateClass {
 	int window_offset;
 } VipsInterpolateClass;
 
-/* Don't put spaces around void here, it breaks gtk-doc.
- */
 VIPS_API
 GType vips_interpolate_get_type(void);
 VIPS_API

package/include/vips/memory.h

@@ -71,6 +71,8 @@ extern "C" {
 #define VIPS_ARRAY(OBJ, N, T) \
 	((T *) VIPS_MALLOC(OBJ, (N) * sizeof(T)))
 
+#ifndef __GI_SCANNER__
+
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(VipsImage, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(VipsObject, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(VipsRegion, g_object_unref)
@@ -89,6 +91,8 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(VipsOperation, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(VipsArrayDouble, VipsArrayDouble_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(VipsArrayImage, VipsArrayImage_unref)
 
+#endif /* !__GI_SCANNER__ */
+
 VIPS_API
 void *vips_malloc(VipsObject *object, size_t size);
 VIPS_API

package/include/vips/mosaicing.h

@@ -72,6 +72,10 @@ VIPS_API
 int vips_matrixinvert(VipsImage *m, VipsImage **out, ...)
 	G_GNUC_NULL_TERMINATED;
 
+VIPS_API
+int vips_matrixmultiply(VipsImage *left, VipsImage *right, VipsImage **out, ...)
+	G_GNUC_NULL_TERMINATED;
+
 #ifdef __cplusplus
 }
 #endif /*__cplusplus*/

package/include/vips/object.h

@@ -137,8 +137,7 @@ typedef enum /*< flags >*/ {
 #define VIPS_ARG_INTERPOLATE(CLASS, NAME, PRIORITY, LONG, DESC, FLAGS, OFFSET) \
 	VIPS_ARG_OBJECT(CLASS, NAME, PRIORITY, LONG, DESC, FLAGS, OFFSET, VIPS_TYPE_INTERPOLATE)
 
-#define VIPS_ARG_BOOL(CLASS, NAME, PRIORITY, LONG, DESC, \
-	FLAGS, OFFSET, VALUE) \
+#define VIPS_ARG_BOOL(CLASS, NAME, PRIORITY, LONG, DESC, FLAGS, OFFSET, VALUE) \
 	{ \
 		GParamSpec *pspec; \
 \
@@ -151,8 +150,7 @@ typedef enum /*< flags >*/ {
 			pspec, (VipsArgumentFlags) (FLAGS), (PRIORITY), (OFFSET)); \
 	}
 
-#define VIPS_ARG_DOUBLE(CLASS, NAME, PRIORITY, LONG, DESC, \
-	FLAGS, OFFSET, MIN, MAX, VALUE) \
+#define VIPS_ARG_DOUBLE(CLASS, NAME, PRIORITY, LONG, DESC, FLAGS, OFFSET, MIN, MAX, VALUE) \
 	{ \
 		GParamSpec *pspec; \
 \
@@ -165,8 +163,7 @@ typedef enum /*< flags >*/ {
 			pspec, (VipsArgumentFlags) (FLAGS), (PRIORITY), (OFFSET)); \
 	}
 
-#define VIPS_ARG_BOXED(CLASS, NAME, PRIORITY, LONG, DESC, \
-	FLAGS, OFFSET, TYPE) \
+#define VIPS_ARG_BOXED(CLASS, NAME, PRIORITY, LONG, DESC, FLAGS, OFFSET, TYPE) \
 	{ \
 		GParamSpec *pspec; \
 \
@@ -179,8 +176,7 @@ typedef enum /*< flags >*/ {
 			pspec, (VipsArgumentFlags) (FLAGS), (PRIORITY), (OFFSET)); \
 	}
 
-#define VIPS_ARG_INT(CLASS, NAME, PRIORITY, LONG, DESC, \
-	FLAGS, OFFSET, MIN, MAX, VALUE) \
+#define VIPS_ARG_INT(CLASS, NAME, PRIORITY, LONG, DESC, FLAGS, OFFSET, MIN, MAX, VALUE) \
 	{ \
 		GParamSpec *pspec; \
 \
@@ -193,8 +189,7 @@ typedef enum /*< flags >*/ {
 			pspec, (VipsArgumentFlags) (FLAGS), (PRIORITY), (OFFSET)); \
 	}
 
-#define VIPS_ARG_UINT64(CLASS, NAME, PRIORITY, LONG, DESC, \
-	FLAGS, OFFSET, MIN, MAX, VALUE) \
+#define VIPS_ARG_UINT64(CLASS, NAME, PRIORITY, LONG, DESC, FLAGS, OFFSET, MIN, MAX, VALUE) \
 	{ \
 		GParamSpec *pspec; \
 \
@@ -207,8 +202,7 @@ typedef enum /*< flags >*/ {
 			pspec, (VipsArgumentFlags) (FLAGS), (PRIORITY), (OFFSET)); \
 	}
 
-#define VIPS_ARG_ENUM(CLASS, NAME, PRIORITY, LONG, DESC, \
-	FLAGS, OFFSET, TYPE, VALUE) \
+#define VIPS_ARG_ENUM(CLASS, NAME, PRIORITY, LONG, DESC, FLAGS, OFFSET, TYPE, VALUE) \
 	{ \
 		GParamSpec *pspec; \
 \
@@ -221,8 +215,7 @@ typedef enum /*< flags >*/ {
 			pspec, (VipsArgumentFlags) (FLAGS), (PRIORITY), (OFFSET)); \
 	}
 
-#define VIPS_ARG_FLAGS(CLASS, NAME, PRIORITY, LONG, DESC, \
-	FLAGS, OFFSET, TYPE, VALUE) \
+#define VIPS_ARG_FLAGS(CLASS, NAME, PRIORITY, LONG, DESC, FLAGS, OFFSET, TYPE, VALUE) \
 	{ \
 		GParamSpec *pspec; \
 \
@@ -235,8 +228,7 @@ typedef enum /*< flags >*/ {
 			pspec, (VipsArgumentFlags) (FLAGS), (PRIORITY), (OFFSET)); \
 	}
 
-#define VIPS_ARG_STRING(CLASS, NAME, PRIORITY, LONG, DESC, FLAGS, OFFSET, \
-	VALUE) \
+#define VIPS_ARG_STRING(CLASS, NAME, PRIORITY, LONG, DESC, FLAGS, OFFSET, VALUE) \
 	{ \
 		GParamSpec *pspec; \
 \
@@ -318,8 +310,14 @@ typedef GHashTable VipsArgumentTable;
 
 VIPS_API
 int vips_argument_get_id(void);
+
+#ifndef __GI_SCANNER__
+
 void vips__object_set_member(VipsObject *object, GParamSpec *pspec,
 	GObject **member, GObject *argument);
+
+#endif /* !__GI_SCANNER__ */
+
 typedef void *(*VipsArgumentMapFn)(VipsObject *object, GParamSpec *pspec,
 	VipsArgumentClass *argument_class,
 	VipsArgumentInstance *argument_instance, void *a, void *b);
@@ -626,8 +624,6 @@ void vips_object_print_name(VipsObject *object);
 VIPS_API
 gboolean vips_object_sanity(VipsObject *object);
 
-/* Don't put spaces around void here, it breaks gtk-doc.
- */
 VIPS_API
 GType vips_object_get_type(void);
 

package/include/vips/operation.h

@@ -100,8 +100,6 @@ typedef struct _VipsOperationClass {
 	void (*invalidate)(VipsOperation *operation);
 } VipsOperationClass;
 
-/* Don't put spaces around void here, it breaks gtk-doc.
- */
 VIPS_API
 GType vips_operation_get_type(void);
 

package/include/vips/private.h

@@ -40,6 +40,8 @@
 extern "C" {
 #endif /*__cplusplus*/
 
+#include <stdio.h>
+
 #define VIPS_SPARE (8)
 
 /* Private to iofuncs: the minimum number of scanlines we add above and below
@@ -218,8 +220,6 @@ int vips__view_image(struct _VipsImage *image);
 VIPS_API
 int _vips__argument_id;
 
-void vips__meta_init(void);
-
 // autoptr needs typed functions for autofree ... this needs to be in the
 // public API since downstream projects can use our auto defs
 VIPS_API
@@ -227,6 +227,54 @@ void VipsArrayDouble_unref(VipsArrayDouble *array);
 VIPS_API
 void VipsArrayImage_unref(VipsArrayImage *array);
 
+extern gboolean vips__thread_profile;
+
+void vips__thread_gate_start(const char *gate_name);
+void vips__thread_gate_stop(const char *gate_name);
+
+void vips__thread_malloc_free(gint64 size);
+
+FILE *vips__file_open_read(const char *filename,
+	const char *fallback_dir, gboolean text_mode);
+FILE *vips__file_open_write(const char *filename,
+	gboolean text_mode);
+
+/* TODO(kleisauke): VIPS_API is required by vipsedit.
+ */
+VIPS_API
+int vips__write(int fd, const void *buf, size_t count);
+
+/* TODO(kleisauke): VIPS_API is required by test_connections.
+ */
+VIPS_API
+int vips__open(const char *filename, int flags, int mode);
+
+/* TODO(kleisauke): VIPS_API is required by vipsedit.
+ */
+VIPS_API
+char *vips__file_read(FILE *fp, const char *name, size_t *length_out);
+
+/* TODO(kleisauke): VIPS_API is required by the magick module.
+ */
+VIPS_API
+gint64 vips__get_bytes(const char *filename, unsigned char buf[], gint64 len);
+
+/* TODO(kleisauke): VIPS_API is required by vipsedit.
+ */
+VIPS_API
+gint64 vips__seek(int fd, gint64 pos, int whence);
+
+/* TODO(kleisauke): VIPS_API is required by libvips-cpp and vipsheader.
+ */
+VIPS_API
+void vips__filename_split8(const char *name,
+	char *filename, char *option_string);
+
+/* TODO(kleisauke): VIPS_API is required by jpegsave_file_fuzzer.
+ */
+VIPS_API
+char *vips__temp_name(const char *format);
+
 #ifdef __cplusplus
 }
 #endif /*__cplusplus*/

package/include/vips/region.h

@@ -90,9 +90,9 @@ typedef enum {
 struct _VipsRegion {
 	VipsObject parent_object;
 
-	/*< public >*/
 	/* Users may read these two fields.
 	 */
+	/*< public >*/
 	VipsImage *im;	/* Link back to parent image */
 	VipsRect valid; /* Area of parent we can see */
 
@@ -128,8 +128,6 @@ typedef struct _VipsRegionClass {
 
 } VipsRegionClass;
 
-/* Don't put spaces around void here, it breaks gtk-doc.
- */
 VIPS_API
 GType vips_region_get_type(void);
 

package/include/vips/resample.h

@@ -45,6 +45,8 @@ typedef enum {
 	VIPS_KERNEL_MITCHELL,
 	VIPS_KERNEL_LANCZOS2,
 	VIPS_KERNEL_LANCZOS3,
+	VIPS_KERNEL_MKS2013,
+	VIPS_KERNEL_MKS2021,
 	VIPS_KERNEL_LAST
 } VipsKernel;
 

package/include/vips/semaphore.h

@@ -38,8 +38,6 @@
 #define VIPS_SEMAPHORE_H
 
 #include <glib.h>
-#include <vips/vips.h>
-#include <vips/thread.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -48,10 +46,17 @@ extern "C" {
 /* Implement our own semaphores.
  */
 typedef struct {
+	/* All fields are private.
+	 */
+	/*< private >*/
 	char *name;
 	int v;
 
-	GMutex *mutex;
+	GMutex mutex;
+
+	/* FIXME: sizeof(GCond) != sizeof(GCond *)
+	 * https://gitlab.gnome.org/GNOME/glib/-/issues/1256
+	 */
 	GCond *cond;
 } VipsSemaphore;