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

package/include/png.h

@@ -1,6 +1,6 @@
 /* png.h - header file for PNG reference library
  *
- * libpng version 1.6.47
+ * libpng version 1.6.48
  *
  * Copyright (c) 2018-2025 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
@@ -14,7 +14,7 @@
  *   libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger
  *   libpng versions 0.97, January 1998, through 1.6.35, July 2018:
  *     Glenn Randers-Pehrson
- *   libpng versions 1.6.36, December 2018, through 1.6.47, February 2025:
+ *   libpng versions 1.6.36, December 2018, through 1.6.48, April 2025:
  *     Cosmin Truta
  *   See also "Contributing Authors", below.
  */
@@ -238,7 +238,7 @@
  *    ...
  *    1.5.30                  15    10530  15.so.15.30[.0]
  *    ...
- *    1.6.47                  16    10647  16.so.16.47[.0]
+ *    1.6.48                  16    10648  16.so.16.48[.0]
  *
  *    Henceforth the source version will match the shared-library major and
  *    minor numbers; the shared-library major version number will be used for
@@ -274,7 +274,7 @@
  */
 
 /* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.6.47"
+#define PNG_LIBPNG_VER_STRING "1.6.48"
 #define PNG_HEADER_VERSION_STRING " libpng version " PNG_LIBPNG_VER_STRING "\n"
 
 /* The versions of shared library builds should stay in sync, going forward */
@@ -285,7 +285,7 @@
 /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
 #define PNG_LIBPNG_VER_MAJOR   1
 #define PNG_LIBPNG_VER_MINOR   6
-#define PNG_LIBPNG_VER_RELEASE 47
+#define PNG_LIBPNG_VER_RELEASE 48
 
 /* This should be zero for a public release, or non-zero for a
  * development version.
@@ -316,7 +316,7 @@
  * From version 1.0.1 it is:
  * XXYYZZ, where XX=major, YY=minor, ZZ=release
  */
-#define PNG_LIBPNG_VER 10647 /* 1.6.47 */
+#define PNG_LIBPNG_VER 10648 /* 1.6.48 */
 
 /* Library configuration: these options cannot be changed after
  * the library has been built.
@@ -426,7 +426,7 @@ extern "C" {
 /* This triggers a compiler error in png.c, if png.c and png.h
  * do not agree upon the version number.
  */
-typedef char* png_libpng_version_1_6_47;
+typedef char* png_libpng_version_1_6_48;
 
 /* Basic control structions.  Read libpng-manual.txt or libpng.3 for more info.
  *
@@ -1570,7 +1570,7 @@ PNG_EXPORT(226, void, png_set_text_compression_method, (png_structrp png_ptr,
 
 #ifdef PNG_STDIO_SUPPORTED
 /* Initialize the input/output for the PNG file to the default functions. */
-PNG_EXPORT(74, void, png_init_io, (png_structrp png_ptr, png_FILE_p fp));
+PNG_EXPORT(74, void, png_init_io, (png_structrp png_ptr, FILE *fp));
 #endif
 
 /* Replace the (error and abort), and warning functions with user
@@ -3088,7 +3088,7 @@ PNG_EXPORT(234, int, png_image_begin_read_from_file, (png_imagep image,
     */
 
 PNG_EXPORT(235, int, png_image_begin_read_from_stdio, (png_imagep image,
-   FILE* file));
+   FILE *file));
    /* The PNG header is read from the stdio FILE object. */
 #endif /* STDIO */
 
@@ -3163,7 +3163,7 @@ PNG_EXPORT(239, int, png_image_write_to_file, (png_imagep image,
 PNG_EXPORT(240, int, png_image_write_to_stdio, (png_imagep image, FILE *file,
    int convert_to_8_bit, const void *buffer, png_int_32 row_stride,
    const void *colormap));
-   /* Write the image to the given (FILE*). */
+   /* Write the image to the given FILE object. */
 #endif /* SIMPLIFIED_WRITE_STDIO */
 
 /* With all write APIs if image is in one of the linear formats with 16-bit

package/include/pngconf.h

@@ -1,6 +1,6 @@
 /* pngconf.h - machine-configurable file for libpng
  *
- * libpng version 1.6.47
+ * libpng version 1.6.48
  *
  * Copyright (c) 2018-2025 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2016,2018 Glenn Randers-Pehrson
@@ -219,25 +219,13 @@
   /* NOTE: PNGCBAPI always defaults to PNGCAPI. */
 
 #  if defined(PNGAPI) && !defined(PNG_USER_PRIVATEBUILD)
-#     error "PNG_USER_PRIVATEBUILD must be defined if PNGAPI is changed"
+#     error PNG_USER_PRIVATEBUILD must be defined if PNGAPI is changed
 #  endif
 
-#  if (defined(_MSC_VER) && _MSC_VER < 800) ||\
-      (defined(__BORLANDC__) && __BORLANDC__ < 0x500)
-   /* older Borland and MSC
-    * compilers used '__export' and required this to be after
-    * the type.
-    */
-#    ifndef PNG_EXPORT_TYPE
-#      define PNG_EXPORT_TYPE(type) type PNG_IMPEXP
-#    endif
-#    define PNG_DLL_EXPORT __export
-#  else /* newer compiler */
-#    define PNG_DLL_EXPORT __declspec(dllexport)
-#    ifndef PNG_DLL_IMPORT
-#      define PNG_DLL_IMPORT __declspec(dllimport)
-#    endif
-#  endif /* compiler */
+#  define PNG_DLL_EXPORT __declspec(dllexport)
+#  ifndef PNG_DLL_IMPORT
+#    define PNG_DLL_IMPORT __declspec(dllimport)
+#  endif
 
 #else /* !Windows */
 #  if (defined(__IBMC__) || defined(__IBMCPP__)) && defined(__OS2__)
@@ -479,7 +467,7 @@
 #if CHAR_BIT == 8 && UCHAR_MAX == 255
    typedef unsigned char png_byte;
 #else
-#  error "libpng requires 8-bit bytes"
+#  error libpng requires 8-bit bytes
 #endif
 
 #if INT_MIN == -32768 && INT_MAX == 32767
@@ -487,7 +475,7 @@
 #elif SHRT_MIN == -32768 && SHRT_MAX == 32767
    typedef short png_int_16;
 #else
-#  error "libpng requires a signed 16-bit type"
+#  error libpng requires a signed 16-bit integer type
 #endif
 
 #if UINT_MAX == 65535
@@ -495,7 +483,7 @@
 #elif USHRT_MAX == 65535
    typedef unsigned short png_uint_16;
 #else
-#  error "libpng requires an unsigned 16-bit type"
+#  error libpng requires an unsigned 16-bit integer type
 #endif
 
 #if INT_MIN < -2147483646 && INT_MAX > 2147483646
@@ -503,7 +491,7 @@
 #elif LONG_MIN < -2147483646 && LONG_MAX > 2147483646
    typedef long int png_int_32;
 #else
-#  error "libpng requires a signed 32-bit (or more) type"
+#  error libpng requires a signed 32-bit (or longer) integer type
 #endif
 
 #if UINT_MAX > 4294967294U
@@ -511,7 +499,7 @@
 #elif ULONG_MAX > 4294967294U
    typedef unsigned long int png_uint_32;
 #else
-#  error "libpng requires an unsigned 32-bit (or more) type"
+#  error libpng requires an unsigned 32-bit (or longer) integer type
 #endif
 
 /* Prior to 1.6.0, it was possible to disable the use of size_t and ptrdiff_t.
@@ -592,10 +580,6 @@ typedef const png_fixed_point * png_const_fixed_point_p;
 typedef size_t                * png_size_tp;
 typedef const size_t          * png_const_size_tp;
 
-#ifdef PNG_STDIO_SUPPORTED
-typedef FILE            * png_FILE_p;
-#endif
-
 #ifdef PNG_FLOATING_POINT_SUPPORTED
 typedef double       * png_doublep;
 typedef const double * png_const_doublep;
@@ -617,6 +601,15 @@ typedef double          * * png_doublepp;
 /* Pointers to pointers to pointers; i.e., pointer to array */
 typedef char            * * * png_charppp;
 
+#ifdef PNG_STDIO_SUPPORTED
+/* With PNG_STDIO_SUPPORTED it was possible to use I/O streams that were
+ * not necessarily stdio FILE streams, to allow building Windows applications
+ * before Win32 and Windows CE applications before WinCE 3.0, but that kind
+ * of support has long been discontinued.
+ */
+typedef FILE            * png_FILE_p; /* [Deprecated] */
+#endif
+
 #endif /* PNG_BUILDING_SYMBOL_TABLE */
 
 #endif /* PNGCONF_H */

package/include/pnglibconf.h

@@ -1,6 +1,6 @@
 /* pnglibconf.h - library build configuration */
 
-/* libpng version 1.6.47 */
+/* libpng version 1.6.48 */
 
 /* Copyright (c) 2018-2025 Cosmin Truta */
 /* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson */

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