@img/sharp-libvips-dev 1.2.4-rc.0 → 1.3.0-rc.0

package/include/vips/arithmetic.h

@@ -79,7 +79,7 @@ typedef enum {
 	VIPS_OPERATION_MATH_ASINH,
 	VIPS_OPERATION_MATH_ACOSH,
 	VIPS_OPERATION_MATH_ATANH,
-	VIPS_OPERATION_MATH_LAST
+	VIPS_OPERATION_MATH_LAST	/*< skip >*/
 } VipsOperationMath;
 
 /**
@@ -94,7 +94,7 @@ typedef enum {
 	VIPS_OPERATION_MATH2_POW,
 	VIPS_OPERATION_MATH2_WOP,
 	VIPS_OPERATION_MATH2_ATAN2,
-	VIPS_OPERATION_MATH2_LAST
+	VIPS_OPERATION_MATH2_LAST	/*< skip >*/
 } VipsOperationMath2;
 
 /**
@@ -109,7 +109,7 @@ typedef enum {
 	VIPS_OPERATION_ROUND_RINT,
 	VIPS_OPERATION_ROUND_CEIL,
 	VIPS_OPERATION_ROUND_FLOOR,
-	VIPS_OPERATION_ROUND_LAST
+	VIPS_OPERATION_ROUND_LAST	/*< skip >*/
 } VipsOperationRound;
 
 /**
@@ -130,7 +130,7 @@ typedef enum {
 	VIPS_OPERATION_RELATIONAL_LESSEQ,
 	VIPS_OPERATION_RELATIONAL_MORE,
 	VIPS_OPERATION_RELATIONAL_MOREEQ,
-	VIPS_OPERATION_RELATIONAL_LAST
+	VIPS_OPERATION_RELATIONAL_LAST	/*< skip >*/
 } VipsOperationRelational;
 
 /**
@@ -149,7 +149,7 @@ typedef enum {
 	VIPS_OPERATION_BOOLEAN_EOR,
 	VIPS_OPERATION_BOOLEAN_LSHIFT,
 	VIPS_OPERATION_BOOLEAN_RSHIFT,
-	VIPS_OPERATION_BOOLEAN_LAST
+	VIPS_OPERATION_BOOLEAN_LAST	/*< skip >*/
 } VipsOperationBoolean;
 
 /**
@@ -164,7 +164,7 @@ typedef enum {
 	VIPS_OPERATION_COMPLEX_POLAR,
 	VIPS_OPERATION_COMPLEX_RECT,
 	VIPS_OPERATION_COMPLEX_CONJ,
-	VIPS_OPERATION_COMPLEX_LAST
+	VIPS_OPERATION_COMPLEX_LAST	/*< skip >*/
 } VipsOperationComplex;
 
 /**
@@ -174,8 +174,8 @@ typedef enum {
  * See also: [method@Image.complex2].
  */
 typedef enum {
-	VIPS_OPERATION_COMPLEX2_CROSS_PHASE,
-	VIPS_OPERATION_COMPLEX2_LAST
+	VIPS_OPERATION_COMPLEX2_CROSS_PHASE,	/*< nick=cross-phase >*/
+	VIPS_OPERATION_COMPLEX2_LAST	/*< skip >*/
 } VipsOperationComplex2;
 
 /**
@@ -188,7 +188,7 @@ typedef enum {
 typedef enum {
 	VIPS_OPERATION_COMPLEXGET_REAL,
 	VIPS_OPERATION_COMPLEXGET_IMAG,
-	VIPS_OPERATION_COMPLEXGET_LAST
+	VIPS_OPERATION_COMPLEXGET_LAST	/*< skip >*/
 } VipsOperationComplexget;
 
 VIPS_API

package/include/vips/basic.h

@@ -68,6 +68,16 @@
 #define VIPS_DEPRECATED_MACRO_FOR(f)
 #endif
 
+#if !defined(VIPS_DISABLE_DEPRECATION_WARNINGS) && \
+	(G_GNUC_CHECK_VERSION(6, 1) || \
+		__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 0))
+#define VIPS_DEPRECATED_ENUMERATOR G_DEPRECATED
+#define VIPS_DEPRECATED_ENUMERATOR_FOR(f) G_DEPRECATED_FOR(f)
+#else
+#define VIPS_DEPRECATED_ENUMERATOR
+#define VIPS_DEPRECATED_ENUMERATOR_FOR(f)
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif /*__cplusplus*/
@@ -97,7 +107,7 @@ typedef enum {
 	VIPS_PRECISION_INTEGER,
 	VIPS_PRECISION_FLOAT,
 	VIPS_PRECISION_APPROXIMATE,
-	VIPS_PRECISION_LAST
+	VIPS_PRECISION_LAST	/*< skip >*/
 } VipsPrecision;
 
 #ifndef __GI_SCANNER__

package/include/vips/colour.h

@@ -105,13 +105,13 @@ typedef enum {
 	 * four standard ones.
 	 */
 	VIPS_INTENT_AUTO = 32,
-	VIPS_INTENT_LAST
+	VIPS_INTENT_LAST	/*< skip >*/
 } VipsIntent;
 
 typedef enum {
 	VIPS_PCS_LAB,
 	VIPS_PCS_XYZ,
-	VIPS_PCS_LAST
+	VIPS_PCS_LAST	/*< skip >*/
 } VipsPCS;
 
 VIPS_API
@@ -203,6 +203,23 @@ VIPS_API
 int vips_XYZ2CMYK(VipsImage *in, VipsImage **out, ...)
 	G_GNUC_NULL_TERMINATED;
 
+VIPS_API
+int vips_Oklab2XYZ(VipsImage *in, VipsImage **out, ...)
+	G_GNUC_NULL_TERMINATED;
+VIPS_API
+int vips_XYZ2Oklab(VipsImage *in, VipsImage **out, ...)
+	G_GNUC_NULL_TERMINATED;
+VIPS_API
+int vips_Oklch2Oklab(VipsImage *in, VipsImage **out, ...)
+	G_GNUC_NULL_TERMINATED;
+VIPS_API
+int vips_Oklab2Oklch(VipsImage *in, VipsImage **out, ...)
+	G_GNUC_NULL_TERMINATED;
+
+VIPS_API
+int vips_uhdr2scRGB(VipsImage *in, VipsImage **out, ...);
+	G_GNUC_NULL_TERMINATED
+
 VIPS_API
 int vips_profile_load(const char *name, VipsBlob **profile, ...)
 	G_GNUC_NULL_TERMINATED;

package/include/vips/conversion.h

@@ -45,7 +45,7 @@ typedef enum {
 	VIPS_EXTEND_MIRROR,
 	VIPS_EXTEND_WHITE,
 	VIPS_EXTEND_BACKGROUND,
-	VIPS_EXTEND_LAST
+	VIPS_EXTEND_LAST	/*< skip >*/
 } VipsExtend;
 
 typedef enum {
@@ -58,20 +58,20 @@ typedef enum {
 	VIPS_COMPASS_DIRECTION_SOUTH_EAST,
 	VIPS_COMPASS_DIRECTION_SOUTH_WEST,
 	VIPS_COMPASS_DIRECTION_NORTH_WEST,
-	VIPS_COMPASS_DIRECTION_LAST
+	VIPS_COMPASS_DIRECTION_LAST	/*< skip >*/
 } VipsCompassDirection;
 
 typedef enum {
 	VIPS_DIRECTION_HORIZONTAL,
 	VIPS_DIRECTION_VERTICAL,
-	VIPS_DIRECTION_LAST
+	VIPS_DIRECTION_LAST	/*< skip >*/
 } VipsDirection;
 
 typedef enum {
 	VIPS_ALIGN_LOW,
 	VIPS_ALIGN_CENTRE,
 	VIPS_ALIGN_HIGH,
-	VIPS_ALIGN_LAST
+	VIPS_ALIGN_LAST	/*< skip >*/
 } VipsAlign;
 
 typedef enum {
@@ -79,7 +79,7 @@ typedef enum {
 	VIPS_ANGLE_D90,
 	VIPS_ANGLE_D180,
 	VIPS_ANGLE_D270,
-	VIPS_ANGLE_LAST
+	VIPS_ANGLE_LAST	/*< skip >*/
 } VipsAngle;
 
 typedef enum {
@@ -91,7 +91,7 @@ typedef enum {
 	VIPS_ANGLE45_D225,
 	VIPS_ANGLE45_D270,
 	VIPS_ANGLE45_D315,
-	VIPS_ANGLE45_LAST
+	VIPS_ANGLE45_LAST	/*< skip >*/
 } VipsAngle45;
 
 typedef enum {
@@ -102,7 +102,7 @@ typedef enum {
 	VIPS_INTERESTING_LOW,
 	VIPS_INTERESTING_HIGH,
 	VIPS_INTERESTING_ALL,
-	VIPS_INTERESTING_LAST
+	VIPS_INTERESTING_LAST	/*< skip >*/
 } VipsInteresting;
 
 typedef enum {
@@ -131,7 +131,7 @@ typedef enum {
 	VIPS_BLEND_MODE_SOFT_LIGHT,
 	VIPS_BLEND_MODE_DIFFERENCE,
 	VIPS_BLEND_MODE_EXCLUSION,
-	VIPS_BLEND_MODE_LAST
+	VIPS_BLEND_MODE_LAST	/*< skip >*/
 } VipsBlendMode;
 
 VIPS_API

package/include/vips/convolution.h

@@ -42,7 +42,7 @@ typedef enum {
 	VIPS_COMBINE_MAX,
 	VIPS_COMBINE_SUM,
 	VIPS_COMBINE_MIN,
-	VIPS_COMBINE_LAST
+	VIPS_COMBINE_LAST	/*< skip >*/
 } VipsCombine;
 
 VIPS_API

package/include/vips/create.h

@@ -43,7 +43,7 @@ typedef enum {
 	VIPS_TEXT_WRAP_CHAR,
 	VIPS_TEXT_WRAP_WORD_CHAR,
 	VIPS_TEXT_WRAP_NONE,
-	VIPS_TEXT_WRAP_LAST
+	VIPS_TEXT_WRAP_LAST	/*< skip >*/
 } VipsTextWrap;
 
 typedef enum {
@@ -51,7 +51,7 @@ typedef enum {
 	VIPS_SDF_SHAPE_BOX,
 	VIPS_SDF_SHAPE_ROUNDED_BOX,
 	VIPS_SDF_SHAPE_LINE,
-	VIPS_SDF_SHAPE_LAST
+	VIPS_SDF_SHAPE_LAST	/*< skip >*/
 } VipsSdfShape;
 
 VIPS_API

package/include/vips/draw.h

@@ -45,7 +45,7 @@ extern "C" {
 typedef enum {
 	VIPS_COMBINE_MODE_SET,
 	VIPS_COMBINE_MODE_ADD,
-	VIPS_COMBINE_MODE_LAST
+	VIPS_COMBINE_MODE_LAST	/*< skip >*/
 } VipsCombineMode;
 
 VIPS_API

package/include/vips/enumtypes.h

@@ -119,6 +119,9 @@ VIPS_API
 GType vips_foreign_ppm_format_get_type(void) G_GNUC_CONST;
 #define VIPS_TYPE_FOREIGN_PPM_FORMAT (vips_foreign_ppm_format_get_type())
 VIPS_API
+GType vips_foreign_pdf_page_box_get_type(void) G_GNUC_CONST;
+#define VIPS_TYPE_FOREIGN_PDF_PAGE_BOX (vips_foreign_pdf_page_box_get_type())
+VIPS_API
 GType vips_foreign_dz_layout_get_type(void) G_GNUC_CONST;
 #define VIPS_TYPE_FOREIGN_DZ_LAYOUT (vips_foreign_dz_layout_get_type())
 VIPS_API

package/include/vips/foreign.h

@@ -123,7 +123,7 @@ typedef enum {
 	VIPS_FAIL_ON_TRUNCATED,
 	VIPS_FAIL_ON_ERROR,
 	VIPS_FAIL_ON_WARNING,
-	VIPS_FAIL_ON_LAST
+	VIPS_FAIL_ON_LAST	/*< skip >*/
 } VipsFailOn;
 
 #define VIPS_TYPE_FOREIGN_LOAD (vips_foreign_load_get_type())
@@ -362,7 +362,8 @@ typedef enum /*< flags >*/ {
  * @VIPS_FOREIGN_KEEP_XMP: keep XMP metadata
  * @VIPS_FOREIGN_KEEP_IPTC: keep IPTC metadata
  * @VIPS_FOREIGN_KEEP_ICC: keep ICC metadata
- * @VIPS_FOREIGN_KEEP_OTHER: keep other metadata (e.g. PNG comments and some TIFF tags)
+ * @VIPS_FOREIGN_KEEP_OTHER: keep other metadata (e.g. PNG comments)
+ * @VIPS_FOREIGN_KEEP_GAINMAP: keep the gainmap metadata
  * @VIPS_FOREIGN_KEEP_ALL: keep all metadata
  *
  * Which metadata to retain.
@@ -374,12 +375,14 @@ typedef enum /*< flags >*/ {
 	VIPS_FOREIGN_KEEP_IPTC = 1 << 2,
 	VIPS_FOREIGN_KEEP_ICC = 1 << 3,
 	VIPS_FOREIGN_KEEP_OTHER = 1 << 4,
+	VIPS_FOREIGN_KEEP_GAINMAP = 1 << 5,
 
 	VIPS_FOREIGN_KEEP_ALL = (VIPS_FOREIGN_KEEP_EXIF |
 		VIPS_FOREIGN_KEEP_XMP |
 		VIPS_FOREIGN_KEEP_IPTC |
 		VIPS_FOREIGN_KEEP_ICC |
-		VIPS_FOREIGN_KEEP_OTHER)
+		VIPS_FOREIGN_KEEP_OTHER |
+		VIPS_FOREIGN_KEEP_GAINMAP)
 } VipsForeignKeep;
 
 typedef struct _VipsForeignSave {
@@ -495,7 +498,7 @@ typedef enum {
 	VIPS_FOREIGN_SUBSAMPLE_AUTO,
 	VIPS_FOREIGN_SUBSAMPLE_ON,
 	VIPS_FOREIGN_SUBSAMPLE_OFF,
-	VIPS_FOREIGN_SUBSAMPLE_LAST
+	VIPS_FOREIGN_SUBSAMPLE_LAST	/*< skip >*/
 } VipsForeignSubsample;
 
 VIPS_API
@@ -539,7 +542,7 @@ typedef enum {
 	VIPS_FOREIGN_WEBP_PRESET_DRAWING,
 	VIPS_FOREIGN_WEBP_PRESET_ICON,
 	VIPS_FOREIGN_WEBP_PRESET_TEXT,
-	VIPS_FOREIGN_WEBP_PRESET_LAST
+	VIPS_FOREIGN_WEBP_PRESET_LAST	/*< skip >*/
 } VipsForeignWebpPreset;
 
 VIPS_API
@@ -597,7 +600,7 @@ typedef enum {
 	VIPS_FOREIGN_TIFF_COMPRESSION_WEBP,
 	VIPS_FOREIGN_TIFF_COMPRESSION_ZSTD,
 	VIPS_FOREIGN_TIFF_COMPRESSION_JP2K,
-	VIPS_FOREIGN_TIFF_COMPRESSION_LAST
+	VIPS_FOREIGN_TIFF_COMPRESSION_LAST	/*< skip >*/
 } VipsForeignTiffCompression;
 
 /**
@@ -613,7 +616,7 @@ typedef enum {
 	VIPS_FOREIGN_TIFF_PREDICTOR_NONE = 1,
 	VIPS_FOREIGN_TIFF_PREDICTOR_HORIZONTAL = 2,
 	VIPS_FOREIGN_TIFF_PREDICTOR_FLOAT = 3,
-	VIPS_FOREIGN_TIFF_PREDICTOR_LAST
+	VIPS_FOREIGN_TIFF_PREDICTOR_LAST	/*< skip >*/
 } VipsForeignTiffPredictor;
 
 /**
@@ -626,7 +629,7 @@ typedef enum {
 typedef enum {
 	VIPS_FOREIGN_TIFF_RESUNIT_CM,
 	VIPS_FOREIGN_TIFF_RESUNIT_INCH,
-	VIPS_FOREIGN_TIFF_RESUNIT_LAST
+	VIPS_FOREIGN_TIFF_RESUNIT_LAST	/*< skip >*/
 } VipsForeignTiffResunit;
 
 VIPS_API
@@ -716,6 +719,9 @@ VIPS_API
 int vips_magickload_buffer(void *buf, size_t len, VipsImage **out, ...)
 	G_GNUC_NULL_TERMINATED;
 VIPS_API
+int vips_magickload_source(VipsSource *source, VipsImage **out, ...)
+	G_GNUC_NULL_TERMINATED;
+VIPS_API
 int vips_magicksave(VipsImage *in, const char *filename, ...)
 	G_GNUC_NULL_TERMINATED;
 VIPS_API
@@ -790,7 +796,7 @@ typedef enum {
 	VIPS_FOREIGN_PPM_FORMAT_PPM,
 	VIPS_FOREIGN_PPM_FORMAT_PFM,
 	VIPS_FOREIGN_PPM_FORMAT_PNM,
-	VIPS_FOREIGN_PPM_FORMAT_LAST
+	VIPS_FOREIGN_PPM_FORMAT_LAST	/*< skip >*/
 } VipsForeignPpmFormat;
 
 VIPS_API
@@ -832,6 +838,29 @@ VIPS_API
 int vips_radsave_target(VipsImage *in, VipsTarget *target, ...)
 	G_GNUC_NULL_TERMINATED;
 
+/**
+ * VipsForeignPdfPageBox:
+ * @VIPS_FOREIGN_PDF_PAGE_BOX_MEDIA: media box
+ * @VIPS_FOREIGN_PDF_PAGE_BOX_CROP: crop box
+ * @VIPS_FOREIGN_PDF_PAGE_BOX_TRIM: trim box
+ * @VIPS_FOREIGN_PDF_PAGE_BOX_BLEED: bleed box
+ * @VIPS_FOREIGN_PDF_PAGE_BOX_ART: art box
+ *
+ * Each page of a PDF document can contain multiple page boxes,
+ * also known as boundary boxes or print marks.
+ *
+ * Each page box defines a region of the complete page that
+ * should be rendered. The default region is the crop box.
+ */
+typedef enum {
+	VIPS_FOREIGN_PDF_PAGE_BOX_MEDIA,
+	VIPS_FOREIGN_PDF_PAGE_BOX_CROP,
+	VIPS_FOREIGN_PDF_PAGE_BOX_TRIM,
+	VIPS_FOREIGN_PDF_PAGE_BOX_BLEED,
+	VIPS_FOREIGN_PDF_PAGE_BOX_ART,
+	VIPS_FOREIGN_PDF_PAGE_BOX_LAST /*< skip >*/
+} VipsForeignPdfPageBox;
+
 VIPS_API
 int vips_pdfload(const char *filename, VipsImage **out, ...)
 	G_GNUC_NULL_TERMINATED;
@@ -875,6 +904,36 @@ VIPS_API
 int vips_gifsave_target(VipsImage *in, VipsTarget *target, ...)
 	G_GNUC_NULL_TERMINATED;
 
+VIPS_API
+int vips_dcrawload(const char *filename, VipsImage **out, ...)
+	G_GNUC_NULL_TERMINATED;
+VIPS_API
+int vips_dcrawload_buffer(void *buf, size_t len, VipsImage **out, ...)
+	G_GNUC_NULL_TERMINATED;
+VIPS_API
+int vips_dcrawload_source(VipsSource *source, VipsImage **out, ...)
+	G_GNUC_NULL_TERMINATED;
+
+VIPS_API
+int vips_uhdrload(const char *filename, VipsImage **out, ...)
+	G_GNUC_NULL_TERMINATED;
+VIPS_API
+int vips_uhdrload_buffer(void *buf, size_t len, VipsImage **out, ...)
+	G_GNUC_NULL_TERMINATED;
+VIPS_API
+int vips_uhdrload_source(VipsSource *source, VipsImage **out, ...)
+	G_GNUC_NULL_TERMINATED;
+
+VIPS_API
+int vips_uhdrsave(VipsImage *in, const char *filename, ...)
+	G_GNUC_NULL_TERMINATED;
+VIPS_API
+int vips_uhdrsave_buffer(VipsImage *in, void **buf, size_t *len, ...)
+	G_GNUC_NULL_TERMINATED;
+VIPS_API
+int vips_uhdrsave_target(VipsImage *in, VipsTarget *target, ...)
+	G_GNUC_NULL_TERMINATED;
+
 VIPS_API
 int vips_heifload(const char *filename, VipsImage **out, ...)
 	G_GNUC_NULL_TERMINATED;
@@ -958,7 +1017,7 @@ typedef enum {
 	VIPS_FOREIGN_DZ_LAYOUT_GOOGLE,
 	VIPS_FOREIGN_DZ_LAYOUT_IIIF,
 	VIPS_FOREIGN_DZ_LAYOUT_IIIF3,
-	VIPS_FOREIGN_DZ_LAYOUT_LAST
+	VIPS_FOREIGN_DZ_LAYOUT_LAST	/*< skip >*/
 } VipsForeignDzLayout;
 
 /**
@@ -973,7 +1032,7 @@ typedef enum {
 	VIPS_FOREIGN_DZ_DEPTH_ONEPIXEL,
 	VIPS_FOREIGN_DZ_DEPTH_ONETILE,
 	VIPS_FOREIGN_DZ_DEPTH_ONE,
-	VIPS_FOREIGN_DZ_DEPTH_LAST
+	VIPS_FOREIGN_DZ_DEPTH_LAST	/*< skip >*/
 } VipsForeignDzDepth;
 
 /**
@@ -982,13 +1041,13 @@ typedef enum {
  * @VIPS_FOREIGN_DZ_CONTAINER_ZIP: write tiles to a zip file
  * @VIPS_FOREIGN_DZ_CONTAINER_SZI: write to a szi file
  *
- * How many pyramid layers to create.
+ * What container format to use.
  */
 typedef enum {
 	VIPS_FOREIGN_DZ_CONTAINER_FS,
 	VIPS_FOREIGN_DZ_CONTAINER_ZIP,
 	VIPS_FOREIGN_DZ_CONTAINER_SZI,
-	VIPS_FOREIGN_DZ_CONTAINER_LAST
+	VIPS_FOREIGN_DZ_CONTAINER_LAST	/*< skip >*/
 } VipsForeignDzContainer;
 
 VIPS_API
@@ -1017,7 +1076,7 @@ typedef enum {
 	VIPS_FOREIGN_HEIF_COMPRESSION_AVC = 2,
 	VIPS_FOREIGN_HEIF_COMPRESSION_JPEG = 3,
 	VIPS_FOREIGN_HEIF_COMPRESSION_AV1 = 4,
-	VIPS_FOREIGN_HEIF_COMPRESSION_LAST
+	VIPS_FOREIGN_HEIF_COMPRESSION_LAST	/*< skip >*/
 } VipsForeignHeifCompression;
 
 /**
@@ -1039,7 +1098,7 @@ typedef enum {
 	VIPS_FOREIGN_HEIF_ENCODER_RAV1E,
 	VIPS_FOREIGN_HEIF_ENCODER_SVT,
 	VIPS_FOREIGN_HEIF_ENCODER_X265,
-	VIPS_FOREIGN_HEIF_ENCODER_LAST
+	VIPS_FOREIGN_HEIF_ENCODER_LAST	/*< skip >*/
 } VipsForeignHeifEncoder;
 
 #ifdef __cplusplus

package/include/vips/header.h

@@ -178,6 +178,20 @@ extern "C" {
  */
 #define VIPS_META_CONCURRENCY "concurrency"
 
+/**
+ * VIPS_META_TILE_WIDTH
+ *
+ * If set, the width of the tiles for this image.
+ */
+#define VIPS_META_TILE_WIDTH "tile-width"
+
+/**
+ * VIPS_META_TILE_HEIGHT
+ *
+ * If set, the height of the tiles for this image.
+ */
+#define VIPS_META_TILE_HEIGHT "tile-height"
+
 VIPS_API
 guint64 vips_format_sizeof(VipsBandFormat format);
 VIPS_API
@@ -185,6 +199,8 @@ guint64 vips_format_sizeof_unsafe(VipsBandFormat format);
 
 VIPS_API
 double vips_interpretation_max_alpha(VipsInterpretation interpretation);
+VIPS_API
+int vips_interpretation_bands(VipsInterpretation interpretation);
 
 VIPS_API
 int vips_image_get_width(const VipsImage *image);
@@ -233,6 +249,12 @@ gboolean vips_image_get_orientation_swap(VipsImage *image);
 VIPS_API
 int vips_image_get_concurrency(VipsImage *image, int default_concurrency);
 VIPS_API
+int vips_image_get_tile_width(VipsImage *image);
+VIPS_API
+int vips_image_get_tile_height(VipsImage *image);
+VIPS_API
+VipsImage *vips_image_get_gainmap(VipsImage *image);
+VIPS_API
 const void *vips_image_get_data(VipsImage *image);
 
 VIPS_API

package/include/vips/image.h

@@ -112,7 +112,9 @@ typedef enum {
 	VIPS_INTERPRETATION_MATRIX = 27,
 	VIPS_INTERPRETATION_scRGB = 28,
 	VIPS_INTERPRETATION_HSV = 29,
-	VIPS_INTERPRETATION_LAST = 30
+	VIPS_INTERPRETATION_OKLAB = 30,
+	VIPS_INTERPRETATION_OKLCH = 31,
+	VIPS_INTERPRETATION_LAST = 32	/*< skip >*/
 } VipsInterpretation;
 
 typedef enum {
@@ -127,7 +129,7 @@ typedef enum {
 	VIPS_FORMAT_COMPLEX = 7,
 	VIPS_FORMAT_DOUBLE = 8,
 	VIPS_FORMAT_DPCOMPLEX = 9,
-	VIPS_FORMAT_LAST = 10
+	VIPS_FORMAT_LAST = 10	/*< skip >*/
 } VipsBandFormat;
 
 typedef enum {
@@ -135,14 +137,15 @@ typedef enum {
 	VIPS_CODING_NONE = 0,
 	VIPS_CODING_LABQ = 2,
 	VIPS_CODING_RAD = 6,
-	VIPS_CODING_LAST = 7
+	VIPS_CODING_LAST = 7	/*< skip >*/
 } VipsCoding;
 
 typedef enum {
 	VIPS_ACCESS_RANDOM,
 	VIPS_ACCESS_SEQUENTIAL,
-	VIPS_ACCESS_SEQUENTIAL_UNBUFFERED,
-	VIPS_ACCESS_LAST
+	VIPS_ACCESS_SEQUENTIAL_UNBUFFERED
+		VIPS_DEPRECATED_ENUMERATOR_FOR(VIPS_ACCESS_SEQUENTIAL),
+	VIPS_ACCESS_LAST	/*< skip >*/
 } VipsAccess;
 
 typedef void *(*VipsStartFn)(VipsImage *out, void *a, void *b);

package/include/vips/morphology.h

@@ -41,7 +41,7 @@ extern "C" {
 typedef enum {
 	VIPS_OPERATION_MORPHOLOGY_ERODE,
 	VIPS_OPERATION_MORPHOLOGY_DILATE,
-	VIPS_OPERATION_MORPHOLOGY_LAST
+	VIPS_OPERATION_MORPHOLOGY_LAST	/*< skip >*/
 } VipsOperationMorphology;
 
 VIPS_API

package/include/vips/operation.h

@@ -44,7 +44,8 @@ extern "C" {
 typedef enum /*< flags >*/ {
 	VIPS_OPERATION_NONE = 0,
 	VIPS_OPERATION_SEQUENTIAL = 1,
-	VIPS_OPERATION_SEQUENTIAL_UNBUFFERED = 2,
+	VIPS_OPERATION_SEQUENTIAL_UNBUFFERED
+		VIPS_DEPRECATED_ENUMERATOR_FOR(VIPS_OPERATION_SEQUENTIAL) = 2,
 	VIPS_OPERATION_NOCACHE = 4,
 	VIPS_OPERATION_DEPRECATED = 8,
 	VIPS_OPERATION_UNTRUSTED = 16,

package/include/vips/private.h

@@ -44,16 +44,6 @@ extern "C" {
 
 #define VIPS_SPARE (8)
 
-/* Private to iofuncs: the minimum number of scanlines we add above and below
- * the window as a margin for slop.
- */
-#define VIPS__WINDOW_MARGIN_PIXELS (128)
-
-/* Private to iofuncs: add at least this many bytes above and below the window.
- * There's no point mapping just a few KB of a small image.
- */
-#define VIPS__WINDOW_MARGIN_BYTES (1024 * 1024 * 10)
-
 /* sizeof() a VIPS header on disc.
  */
 #define VIPS_SIZEOF_HEADER (64)
@@ -275,6 +265,11 @@ void vips__filename_split8(const char *name,
 VIPS_API
 char *vips__temp_name(const char *format);
 
+/* Used by libvips tools.
+ */
+VIPS_API
+void vips__win32_terminate(int ret);
+
 #ifdef __cplusplus
 }
 #endif /*__cplusplus*/

package/include/vips/region.h

@@ -72,6 +72,12 @@ extern "C" {
  * @VIPS_REGION_SHRINK_NEAREST: use the top-left pixel
  *
  * How to calculate the output pixels when shrinking a 2x2 region.
+ *
+ * Images with alpha (see [method@Image.hasalpha]) always shrink with
+ * [enum@Vips.RegionShrink.MEAN] and pixels scaled by alpha to avoid fringing.
+ *
+ * Set the image interpretation to [enum@Vips.Interpretation.MULTIBAND] to
+ * treat all bands equally.
  */
 typedef enum {
 	VIPS_REGION_SHRINK_MEAN,
@@ -80,7 +86,7 @@ typedef enum {
 	VIPS_REGION_SHRINK_MAX,
 	VIPS_REGION_SHRINK_MIN,
 	VIPS_REGION_SHRINK_NEAREST,
-	VIPS_REGION_SHRINK_LAST
+	VIPS_REGION_SHRINK_LAST	/*< skip >*/
 } VipsRegionShrink;
 
 /* Sub-area of image.

package/include/vips/resample.h

@@ -47,7 +47,7 @@ typedef enum {
 	VIPS_KERNEL_LANCZOS3,
 	VIPS_KERNEL_MKS2013,
 	VIPS_KERNEL_MKS2021,
-	VIPS_KERNEL_LAST
+	VIPS_KERNEL_LAST	/*< skip >*/
 } VipsKernel;
 
 typedef enum {
@@ -55,7 +55,7 @@ typedef enum {
 	VIPS_SIZE_UP,
 	VIPS_SIZE_DOWN,
 	VIPS_SIZE_FORCE,
-	VIPS_SIZE_LAST
+	VIPS_SIZE_LAST	/*< skip >*/
 } VipsSize;
 
 VIPS_API

package/include/vips/semaphore.h

@@ -53,11 +53,7 @@ typedef struct {
 	int v;
 
 	GMutex mutex;
-
-	/* FIXME: sizeof(GCond) != sizeof(GCond *)
-	 * https://gitlab.gnome.org/GNOME/glib/-/issues/1256
-	 */
-	GCond *cond;
+	GCond cond;
 } VipsSemaphore;
 
 VIPS_API

package/include/vips/threadpool.h

@@ -96,7 +96,6 @@ typedef struct _VipsThreadState {
 	 * debugging race conditions.
 	 */
 	gboolean stall;
-
 } VipsThreadState;
 
 typedef struct _VipsThreadStateClass {