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

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;
 

package/include/vips/thread.h

@@ -36,25 +36,8 @@
 extern "C" {
 #endif /*__cplusplus*/
 
-/* We need wrappers over g_mutex_new(), it was replaced by g_mutex_init() in
- * glib 2.32+
- */
-VIPS_API
-GMutex *vips_g_mutex_new(void);
-VIPS_API
-void vips_g_mutex_free(GMutex *);
-
-/* Same for GCond.
- */
 VIPS_API
-GCond *vips_g_cond_new(void);
-VIPS_API
-void vips_g_cond_free(GCond *);
-
-/* ... and for GThread.
- */
-VIPS_API
-GThread *vips_g_thread_new(const char *, GThreadFunc, gpointer);
+GThread *vips_g_thread_new(const char *domain, GThreadFunc func, gpointer data);
 
 VIPS_API
 gboolean vips_thread_isvips(void);
@@ -62,12 +45,6 @@ gboolean vips_thread_isvips(void);
 VIPS_API
 int vips_thread_execute(const char *domain, GFunc func, gpointer data);
 
-typedef struct _VipsThreadset VipsThreadset;
-VipsThreadset *vips_threadset_new(int max_threads);
-int vips_threadset_run(VipsThreadset *set,
-	const char *domain, GFunc func, gpointer data);
-void vips_threadset_free(VipsThreadset *set);
-
 #ifdef __cplusplus
 }
 #endif /*__cplusplus*/

package/include/vips/threadpool.h

@@ -51,10 +51,6 @@
 extern "C" {
 #endif /*__cplusplus*/
 
-/* Per-thread state. Allocate functions can use these members to
- * communicate with work functions.
- */
-
 #define VIPS_TYPE_THREAD_STATE (vips_thread_state_get_type())
 #define VIPS_THREAD_STATE(obj) \
 	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
@@ -112,8 +108,6 @@ typedef struct _VipsThreadStateClass {
 VIPS_API
 void *vips_thread_state_set(VipsObject *object, void *a, void *b);
 
-/* Don't put spaces around void here, it breaks gtk-doc.
- */
 VIPS_API
 GType vips_thread_state_get_type(void);
 

package/include/vips/type.h

@@ -38,6 +38,8 @@
 extern "C" {
 #endif /*__cplusplus*/
 
+#ifndef __GI_SCANNER__
+
 /* A very simple boxed type for testing. Just holds an int.
  */
 typedef struct _VipsThing {
@@ -47,7 +49,7 @@ typedef struct _VipsThing {
 /**
  * VIPS_TYPE_THING:
  *
- * The #GType for a #VipsThing.
+ * The [alias@GObject.Type] for a #VipsThing.
  */
 #define VIPS_TYPE_THING (vips_thing_get_type())
 VIPS_API
@@ -55,6 +57,8 @@ GType vips_thing_get_type(void);
 VIPS_API
 VipsThing *vips_thing_new(int i);
 
+#endif /* !__GI_SCANNER__ */
+
 /* A ref-counted area of memory. Can hold arrays of things as well.
  */
 typedef struct _VipsArea {
@@ -74,7 +78,7 @@ typedef struct _VipsArea {
 	 * structure, so a simple GMutex is OK.
 	 */
 	int count;
-	GMutex *lock;
+	GMutex lock;
 
 	/* Things like ICC profiles need their own free functions.
 	 *
@@ -131,7 +135,7 @@ void *vips_area_get_data(VipsArea *area,
 /**
  * VIPS_TYPE_AREA:
  *
- * The #GType for a #VipsArea.
+ * The [alias@GObject.Type] for a [struct@Area].
  */
 #define VIPS_TYPE_AREA (vips_area_get_type())
 #define VIPS_AREA(X) ((VipsArea *) (X))
@@ -141,7 +145,7 @@ GType vips_area_get_type(void);
 /**
  * VIPS_TYPE_SAVE_STRING:
  *
- * The #GType for a #VipsSaveString.
+ * The [alias@GObject.Type] for a [struct@SaveString].
  */
 #define VIPS_TYPE_SAVE_STRING (vips_save_string_get_type())
 VIPS_API
@@ -154,7 +158,7 @@ typedef struct _VipsSaveString {
 /**
  * VIPS_TYPE_REF_STRING:
  *
- * The #GType for a #VipsRefString.
+ * The [alias@GObject.Type] for a [struct@RefString].
  */
 #define VIPS_TYPE_REF_STRING (vips_ref_string_get_type())
 
@@ -172,7 +176,7 @@ GType vips_ref_string_get_type(void);
 /**
  * VIPS_TYPE_BLOB:
  *
- * The %GType for a #VipsBlob.
+ * The [alias@GObject.Type] for a [struct@Blob].
  */
 #define VIPS_TYPE_BLOB (vips_blob_get_type())
 
@@ -196,7 +200,7 @@ GType vips_blob_get_type(void);
 /**
  * VIPS_TYPE_ARRAY_DOUBLE:
  *
- * The #GType for a #VipsArrayDouble.
+ * The [alias@GObject.Type] for a [struct@ArrayDouble].
  */
 #define VIPS_TYPE_ARRAY_DOUBLE (vips_array_double_get_type())
 
@@ -216,7 +220,7 @@ GType vips_array_double_get_type(void);
 /**
  * VIPS_TYPE_ARRAY_INT:
  *
- * The #GType for a #VipsArrayInt.
+ * The [alias@GObject.Type] for a [struct@ArrayInt].
  */
 #define VIPS_TYPE_ARRAY_INT (vips_array_int_get_type())
 
@@ -236,7 +240,7 @@ GType vips_array_int_get_type(void);
 /**
  * VIPS_TYPE_ARRAY_IMAGE:
  *
- * The #GType for a #VipsArrayImage.
+ * The [alias@GObject.Type] for a [struct@ArrayImage].
  */
 #define VIPS_TYPE_ARRAY_IMAGE (vips_array_image_get_type())
 

package/include/vips/util.h

@@ -39,7 +39,6 @@
 extern "C" {
 #endif /*__cplusplus*/
 
-#include <stdio.h>
 #include <math.h>
 
 /* Some platforms don't have M_PI :-(
@@ -54,38 +53,25 @@ extern "C" {
 #define VIPS_MAX(A, B) ((A) > (B) ? (A) : (B))
 #define VIPS_MIN(A, B) ((A) < (B) ? (A) : (B))
 
+#define VIPS_FMAX(A, B) fmax((A), (B)) VIPS_DEPRECATED_MACRO_FOR(fmax)
+#define VIPS_FMIN(A, B) fmin((A), (B)) VIPS_DEPRECATED_MACRO_FOR(fmin)
+
 #define VIPS_CLIP(A, V, B) VIPS_MAX((A), VIPS_MIN((B), (V)))
-#define VIPS_FCLIP(A, V, B) VIPS_FMAX((A), VIPS_FMIN((B), (V)))
+#define VIPS_FCLIP(A, V, B) fmax((A), fmin((B), (V)))
 
 #define VIPS_NUMBER(R) ((int) (sizeof(R) / sizeof(R[0])))
 
-#define VIPS_ABS(X) (((X) >= 0) ? (X) : -(X))
+#define VIPS_ABS(V) (((V) >= 0) ? (V) : -(V))
+#define VIPS_FABS(V) fabs((V)) VIPS_DEPRECATED_MACRO_FOR(fabs)
 
 // is something (eg. a pointer) N aligned
 #define VIPS_ALIGNED(P, N) ((((guint64) (P)) & ((N) - 1)) == 0)
 
-/* The built-in isnan and isinf functions provided by gcc 4+ and clang are
- * up to 7x faster than their libc equivalent included from <math.h>.
- */
-#if defined(__clang__) || (__GNUC__ >= 4)
-#define VIPS_ISNAN(V) __builtin_isnan(V)
-#define VIPS_FLOOR(V) __builtin_floor(V)
-#define VIPS_CEIL(V) __builtin_ceil(V)
-#define VIPS_RINT(V) __builtin_rint(V)
-#define VIPS_ROUND(V) __builtin_round(V)
-#define VIPS_FABS(V) __builtin_fabs(V)
-#define VIPS_FMAX(A, B) __builtin_fmax(A, B)
-#define VIPS_FMIN(A, B) __builtin_fmin(A, B)
-#else
-#define VIPS_ISNAN(V) isnan(V)
-#define VIPS_FLOOR(V) floor(V)
-#define VIPS_CEIL(V) ceil(V)
-#define VIPS_RINT(V) rint(V)
-#define VIPS_ROUND(V) round(V)
-#define VIPS_FABS(V) VIPS_ABS(V)
-#define VIPS_FMAX(A, B) VIPS_MAX(A, B)
-#define VIPS_FMIN(A, B) VIPS_MIN(A, B)
-#endif
+#define VIPS_ISNAN(V) isnan(V) VIPS_DEPRECATED_MACRO_FOR(isnan)
+#define VIPS_FLOOR(V) floor(V) VIPS_DEPRECATED_MACRO_FOR(floor)
+#define VIPS_CEIL(V) ceil(V) VIPS_DEPRECATED_MACRO_FOR(ceil)
+#define VIPS_RINT(V) rint(V) VIPS_DEPRECATED_MACRO_FOR(rint)
+#define VIPS_ROUND(V) round(V) VIPS_DEPRECATED_MACRO_FOR(round)
 
 /* Testing status before the function call saves a lot of time.
  */
@@ -97,7 +83,7 @@ extern "C" {
 	} \
 	G_STMT_END
 
-/* VIPS_RINT() does "bankers rounding", it rounds to the nearest even integer.
+/* rint() does "bankers rounding", it rounds to the nearest even integer.
  * For things like image geometry, we want strict nearest int.
  *
  * If you know it's unsigned, _UINT is a little faster.
@@ -298,47 +284,7 @@ int vips_filename_suffix_match(const char *path, const char *suffixes[]);
 
 VIPS_API
 gint64 vips_file_length(int fd);
-/* 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);
-int vips__open_read(const char *filename);
-FILE *vips__fopen(const char *filename, const char *mode);
-
-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
-char *vips__file_read(FILE *fp, const char *name, size_t *length_out);
-char *vips__file_read_name(const char *name, const char *fallback_dir,
-	size_t *length_out);
-int vips__file_write(void *data, size_t size, size_t nmemb, FILE *stream);
-/* TODO(kleisauke): VIPS_API is required by the magick module.
- */
-VIPS_API
-gint64 vips__get_bytes(const char *filename, unsigned char buf[], gint64 len);
-int vips__fgetc(FILE *fp);
-
-GValue *vips__gvalue_ref_string_new(const char *text);
-void vips__gslist_gvalue_free(GSList *list);
-GSList *vips__gslist_gvalue_copy(const GSList *list);
-GSList *vips__gslist_gvalue_merge(GSList *a, const GSList *b);
-char *vips__gslist_gvalue_get(const GSList *list);
 
-gint64 vips__seek_no_error(int fd, gint64 pos, int whence);
-/* TODO(kleisauke): VIPS_API is required by vipsedit.
- */
-VIPS_API
-gint64 vips__seek(int fd, gint64 pos, int whence);
-int vips__ftruncate(int fd, gint64 pos);
 VIPS_API
 int vips_existsf(const char *name, ...)
 	G_GNUC_PRINTF(1, 2);
@@ -355,7 +301,7 @@ VIPS_API
 int vips_rename(const char *old_name, const char *new_name);
 
 /**
- * VipsToken:
+ * VipsToken: (skip)
  * @VIPS_TOKEN_LEFT: left bracket
  * @VIPS_TOKEN_RIGHT: right bracket
  * @VIPS_TOKEN_STRING: string constant
@@ -369,7 +315,6 @@ int vips_rename(const char *old_name, const char *new_name);
  *
  * Strings may be in double quotes, and may contain escaped quote characters,
  * for example string, "string" and "str\"ing".
- *
  */
 typedef enum {
 	VIPS_TOKEN_LEFT = 1,
@@ -379,49 +324,23 @@ typedef enum {
 	VIPS_TOKEN_COMMA
 } VipsToken;
 
+#ifndef __GI_SCANNER__
+
 // we expose this one in the API for testing
 VIPS_API
 const char *vips__token_get(const char *buffer,
 	VipsToken *token, char *string, int size);
-const char *vips__token_must(const char *buffer, VipsToken *token,
-	char *string, int size);
-const char *vips__token_need(const char *buffer, VipsToken need_token,
-	char *string, int size);
-const char *vips__token_segment(const char *p, VipsToken *token,
-	char *string, int size);
-const char *vips__token_segment_need(const char *p, VipsToken need_token,
-	char *string, int size);
-const char *vips__find_rightmost_brackets(const char *p);
-/* 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);
+
+#endif /* !__GI_SCANNER__ */
 
 VIPS_API
 int vips_ispoweroftwo(int p);
 VIPS_API
 int vips_amiMSBfirst(void);
 
-/* TODO(kleisauke): VIPS_API is required by jpegsave_file_fuzzer.
- */
-VIPS_API
-char *vips__temp_name(const char *format);
-
-void vips__change_suffix(const char *name, char *out, int mx,
-	const char *new_suff, const char **olds, int nolds);
-
 VIPS_API
 char *vips_realpath(const char *path);
 
-guint32 vips__random(guint32 seed);
-guint32 vips__random_add(guint32 seed, int value);
-
-const char *vips__icc_dir(void);
-const char *vips__windows_prefix(void);
-
-char *vips__get_iso8601(void);
-
 VIPS_API
 int vips_strtod(const char *str, double *out);
 

package/include/vips/vector.h

@@ -38,10 +38,6 @@
 extern "C" {
 #endif /*__cplusplus*/
 
-/* Set from the command-line.
- */
-extern gboolean vips__vector_enabled;
-
 VIPS_API
 gboolean vips_vector_isenabled(void);
 VIPS_API

package/include/vips/version.h

@@ -4,19 +4,19 @@
 #ifndef VIPS_VERSION_H
 #define VIPS_VERSION_H
 
-#define VIPS_VERSION "8.16.1"
-#define VIPS_VERSION_STRING "8.16.1"
+#define VIPS_VERSION "8.17.0"
+#define VIPS_VERSION_STRING "8.17.0"
 #define VIPS_MAJOR_VERSION (8)
-#define VIPS_MINOR_VERSION (16)
-#define VIPS_MICRO_VERSION (1)
+#define VIPS_MINOR_VERSION (17)
+#define VIPS_MICRO_VERSION (0)
 
 /* The ABI version, as used for library versioning.
  */
-#define VIPS_LIBRARY_CURRENT (60)
-#define VIPS_LIBRARY_REVISION (1)
-#define VIPS_LIBRARY_AGE (18)
+#define VIPS_LIBRARY_CURRENT (61)
+#define VIPS_LIBRARY_REVISION (0)
+#define VIPS_LIBRARY_AGE (19)
 
-#define VIPS_CONFIG "enable debug: false\nenable deprecated: false\nenable modules: false\nenable cplusplus: true\nenable RAD load/save: false\nenable Analyze7 load: false\nenable PPM load/save: false\nenable GIF load: true\nFFTs with fftw: false\nSIMD support with libhwy: true\nICC profile support with lcms2: true\ndeflate compression with zlib: true\ntext rendering with pangocairo: true\nfont file support with fontconfig: true\nEXIF metadata support with libexif: true\nJPEG load/save with libjpeg: true\nJXL load/save with libjxl: false (dynamic module: false)\nJPEG2000 load/save with OpenJPEG: false\nPNG load/save with spng: true\nimage quantisation with imagequant: true\nTIFF load/save with libtiff-4: true\nimage pyramid save with libarchive: true\nHEIC/AVIF load/save with libheif: true (dynamic module: false)\nWebP load/save with libwebp: true\nPDF load with PDFium or Poppler: false (dynamic module: false)\nSVG load with librsvg-2.0: true\nEXR load with OpenEXR: false\nWSI load with OpenSlide: false (dynamic module: false)\nMatlab load with Matio: false\nNIfTI load/save with libnifti: false\nFITS load/save with cfitsio: false\nGIF save with cgif: true\nMagick load/save with MagickCore: false (dynamic module: false)"
+#define VIPS_CONFIG "enable debug: false\nenable deprecated: false\nenable modules: false\nenable C++ binding: true\nenable RAD load/save: false\nenable Analyze7 load: false\nenable PPM load/save: false\nenable GIF load: true\nFFTs with fftw: false\nSIMD support with libhwy: true\nICC profile support with lcms2: true\ndeflate compression with zlib: true\ntext rendering with pangocairo: true\nfont file support with fontconfig: true\nEXIF metadata support with libexif: true\nJPEG load/save with libjpeg: true\nJXL load/save with libjxl: false (dynamic module: false)\nJPEG2000 load/save with OpenJPEG: false\nPNG load/save with spng: true\nimage quantisation with imagequant: true\nTIFF load/save with libtiff-4: true\nimage pyramid save with libarchive: true\nHEIC/AVIF load/save with libheif: true (dynamic module: false)\nWebP load/save with libwebp: true\nPDF load with PDFium or Poppler: false (dynamic module: false)\nSVG load with librsvg-2.0: true\nEXR load with OpenEXR: false\nWSI load with OpenSlide: false (dynamic module: false)\nMatlab load with Matio: false\nNIfTI load/save with libnifti: false\nFITS load/save with cfitsio: false\nGIF save with cgif: true\nMagick load/save with MagickCore: false (dynamic module: false)"
 
 /* Not really anything to do with versions, but this is a handy place to put
  * it.

package/include/vips/vips.h

@@ -117,6 +117,7 @@ extern "C" {
 #include <vips/generate.h>
 #include <vips/interpolate.h>
 #include <vips/semaphore.h>
+#include <vips/thread.h>
 #include <vips/threadpool.h>
 #include <vips/header.h>
 #include <vips/operation.h>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@img/sharp-libvips-dev",
-  "version": "1.1.0-rc5",
+  "version": "1.2.0-rc.1",
   "description": "Header files and C++ sources for libvips and dependencies required when compiling sharp from source",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",

package/versions.json

@@ -1,30 +1,30 @@
 {
-  "aom": "3.12.0",
-  "archive": "3.7.9",
+  "aom": "3.12.1",
+  "archive": "3.8.1",
   "cairo": "1.18.4",
   "cgif": "0.5.0",
   "exif": "0.6.25",
   "expat": "2.7.1",
-  "ffi": "3.4.7",
-  "fontconfig": "2.16.1",
+  "ffi": "3.5.1",
+  "fontconfig": "2.16.2",
   "freetype": "2.13.3",
   "fribidi": "1.0.16",
-  "glib": "2.84.0",
-  "harfbuzz": "11.0.0",
-  "heif": "1.19.7",
+  "glib": "2.85.0",
+  "harfbuzz": "11.2.1",
+  "heif": "1.19.8",
   "highway": "1.2.0",
   "imagequant": "2.4.1",
   "lcms": "2.17",
   "mozjpeg": "4.1.5",
   "pango": "1.56.3",
-  "pixman": "0.44.2",
-  "png": "1.6.47",
+  "pixman": "0.46.2",
+  "png": "1.6.48",
   "proxy-libintl": "0.4",
   "rsvg": "2.60.0",
   "spng": "0.7.4",
   "tiff": "4.7.0",
-  "vips": "8.16.1",
+  "vips": "8.17.0",
   "webp": "1.5.0",
-  "xml": "2.13.7",
+  "xml2": "2.14.3",
   "zlib-ng": "2.2.4"
 }