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

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*/

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*/