@img/sharp-libvips-dev 1.0.6 → 1.1.0-rc2

package/include/vips/arithmetic.h

@@ -234,6 +234,15 @@ VIPS_API
 int vips_sign(VipsImage *in, VipsImage **out, ...)
 	G_GNUC_NULL_TERMINATED;
 VIPS_API
+int vips_clamp(VipsImage *in, VipsImage **out, ...)
+	G_GNUC_NULL_TERMINATED;
+VIPS_API
+int vips_maxpair(VipsImage *left, VipsImage *right, VipsImage **out, ...)
+	G_GNUC_NULL_TERMINATED;
+VIPS_API
+int vips_minpair(VipsImage *left, VipsImage *right, VipsImage **out, ...)
+	G_GNUC_NULL_TERMINATED;
+VIPS_API
 int vips_round(VipsImage *in, VipsImage **out, VipsOperationRound round, ...)
 	G_GNUC_NULL_TERMINATED;
 VIPS_API

package/include/vips/basic.h

@@ -36,12 +36,12 @@
 
 /* Defined in config.h
  */
-#ifdef _VIPS_PUBLIC
-#define VIPS_API _VIPS_PUBLIC extern
-#else
-#define VIPS_API extern
+#ifndef _VIPS_PUBLIC
+#define _VIPS_PUBLIC
 #endif
 
+#define VIPS_API _VIPS_PUBLIC extern
+
 /* VIPS_DISABLE_DEPRECATION_WARNINGS:
  *
  * Disable deprecation warnings from VIPS API.
@@ -105,6 +105,10 @@ struct _VipsSource;
 typedef struct _VipsSource VipsSource;
 struct _VipsTarget;
 typedef struct _VipsTarget VipsTarget;
+struct _VipsInterpolate;
+typedef struct _VipsInterpolate VipsInterpolate;
+struct _VipsOperation;
+typedef struct _VipsOperation VipsOperation;
 
 #ifdef __cplusplus
 }

package/include/vips/buf.h

@@ -89,8 +89,6 @@ gboolean vips_buf_vappendf(VipsBuf *buf, const char *fmt, va_list ap);
 VIPS_API
 gboolean vips_buf_appendc(VipsBuf *buf, char ch);
 VIPS_API
-gboolean vips_buf_appendsc(VipsBuf *buf, gboolean quote, const char *str);
-VIPS_API
 gboolean vips_buf_appendgv(VipsBuf *buf, GValue *value);
 VIPS_API
 gboolean vips_buf_append_size(VipsBuf *buf, size_t n);

package/include/vips/connection.h

@@ -501,8 +501,6 @@ VIPS_API
 gint64 vips_target_seek(VipsTarget *target, gint64 offset, int whence);
 VIPS_API
 int vips_target_end(VipsTarget *target);
-VIPS_DEPRECATED_FOR(vips_target_end)
-void vips_target_finish(VipsTarget *target);
 VIPS_API
 unsigned char *vips_target_steal(VipsTarget *target, size_t *length);
 VIPS_API

package/include/vips/conversion.h

@@ -147,9 +147,6 @@ VIPS_API
 int vips_sequential(VipsImage *in, VipsImage **out, ...)
 	G_GNUC_NULL_TERMINATED;
 VIPS_API
-int vips_cache(VipsImage *in, VipsImage **out, ...)
-	G_GNUC_NULL_TERMINATED;
-VIPS_API
 int vips_copy_file(VipsImage *in, VipsImage **out, ...)
 	G_GNUC_NULL_TERMINATED;
 

package/include/vips/create.h

@@ -46,6 +46,14 @@ typedef enum {
 	VIPS_TEXT_WRAP_LAST
 } VipsTextWrap;
 
+typedef enum {
+	VIPS_SDF_SHAPE_CIRCLE = 0,
+	VIPS_SDF_SHAPE_BOX,
+	VIPS_SDF_SHAPE_ROUNDED_BOX,
+	VIPS_SDF_SHAPE_LINE,
+	VIPS_SDF_SHAPE_LAST
+} VipsSdfShape;
+
 VIPS_API
 int vips_black(VipsImage **out, int width, int height, ...)
 	G_GNUC_NULL_TERMINATED;
@@ -79,6 +87,9 @@ int vips_sines(VipsImage **out, int width, int height, ...)
 VIPS_API
 int vips_zone(VipsImage **out, int width, int height, ...)
 	G_GNUC_NULL_TERMINATED;
+VIPS_API
+int vips_sdf(VipsImage **out, int width, int height, VipsSdfShape shape, ...)
+	G_GNUC_NULL_TERMINATED;
 
 VIPS_API
 int vips_identity(VipsImage **out, ...)

package/include/vips/enumtypes.h

@@ -74,6 +74,9 @@ GType vips_combine_get_type(void) G_GNUC_CONST;
 VIPS_API
 GType vips_text_wrap_get_type(void) G_GNUC_CONST;
 #define VIPS_TYPE_TEXT_WRAP (vips_text_wrap_get_type())
+VIPS_API
+GType vips_sdf_shape_get_type(void) G_GNUC_CONST;
+#define VIPS_TYPE_SDF_SHAPE (vips_sdf_shape_get_type())
 /* enumerations from "draw.h" */
 VIPS_API
 GType vips_combine_mode_get_type(void) G_GNUC_CONST;
@@ -95,9 +98,6 @@ VIPS_API
 GType vips_foreign_subsample_get_type(void) G_GNUC_CONST;
 #define VIPS_TYPE_FOREIGN_SUBSAMPLE (vips_foreign_subsample_get_type())
 VIPS_API
-GType vips_foreign_jpeg_subsample_get_type(void) G_GNUC_CONST;
-#define VIPS_TYPE_FOREIGN_JPEG_SUBSAMPLE (vips_foreign_jpeg_subsample_get_type())
-VIPS_API
 GType vips_foreign_webp_preset_get_type(void) G_GNUC_CONST;
 #define VIPS_TYPE_FOREIGN_WEBP_PRESET (vips_foreign_webp_preset_get_type())
 VIPS_API

package/include/vips/foreign.h

@@ -474,23 +474,6 @@ typedef enum {
 	VIPS_FOREIGN_SUBSAMPLE_LAST
 } VipsForeignSubsample;
 
-/**
- * VipsForeignJpegSubsample:
- * @VIPS_FOREIGN_JPEG_SUBSAMPLE_AUTO: default preset
- * @VIPS_FOREIGN_JPEG_SUBSAMPLE_ON: always perform subsampling
- * @VIPS_FOREIGN_JPEG_SUBSAMPLE_OFF: never perform subsampling
- *
- * Set jpeg subsampling mode.
- *
- * DEPRECATED: use #VipsForeignSubsample
- */
-typedef enum {
-	VIPS_FOREIGN_JPEG_SUBSAMPLE_AUTO,
-	VIPS_FOREIGN_JPEG_SUBSAMPLE_ON,
-	VIPS_FOREIGN_JPEG_SUBSAMPLE_OFF,
-	VIPS_FOREIGN_JPEG_SUBSAMPLE_LAST
-} VipsForeignJpegSubsample;
-
 VIPS_API
 int vips_jpegload(const char *filename, VipsImage **out, ...)
 	G_GNUC_NULL_TERMINATED;
@@ -664,7 +647,10 @@ VIPS_API
 int vips_rawsave(VipsImage *in, const char *filename, ...)
 	G_GNUC_NULL_TERMINATED;
 VIPS_API
-int vips_rawsave_fd(VipsImage *in, int fd, ...)
+int vips_rawsave_buffer(VipsImage *in, void **buf, size_t *len, ...)
+	G_GNUC_NULL_TERMINATED;
+VIPS_API
+int vips_rawsave_target(VipsImage *in, VipsTarget *target, ...)
 	G_GNUC_NULL_TERMINATED;
 
 VIPS_API

package/include/vips/header.h

@@ -99,6 +99,13 @@ extern "C" {
  */
 #define VIPS_META_BITS_PER_SAMPLE "bits-per-sample"
 
+/**
+ * VIPS_META_PALETTE:
+ *
+ * Does this image have a palette?
+ */
+#define VIPS_META_PALETTE "palette"
+
 /**
  * VIPS_META_LOADER:
  *

package/include/vips/image.h

@@ -59,9 +59,14 @@ extern "C" {
  * for width/height so we could go up to 2bn, but it's good to have a lower
  * value set so we can see crazy numbers early.
  *
- * This was 1m for a while, but someone found a use for a 4m wide image.
+ * This can be overridden with the `VIPS_MAX_COORD` env var, or the
+ * `--vips-max-coord` CLI arg.
  */
-#define VIPS_MAX_COORD (10000000)
+#define VIPS_DEFAULT_MAX_COORD (100000000)
+
+/* Fetch the overridden value.
+ */
+#define VIPS_MAX_COORD (vips_max_coord_get())
 
 typedef enum {
 	VIPS_DEMAND_STYLE_ERROR = -1,

package/include/vips/interpolate.h

@@ -57,10 +57,9 @@ extern "C" {
 	(G_TYPE_INSTANCE_GET_CLASS((obj), \
 		VIPS_TYPE_INTERPOLATE, VipsInterpolateClass))
 
-typedef struct _VipsInterpolate {
+struct _VipsInterpolate {
 	VipsObject parent_object;
-
-} VipsInterpolate;
+};
 
 /* An interpolation function. This is a class method, but we have a lookup
  * function for it to speed up dispatch. Write to the memory at "out",

package/include/vips/memory.h

@@ -53,7 +53,7 @@ extern "C" {
 	G_STMT_START \
 	{ \
 		const char *sst = (V); \
-\
+		\
 		if ((S) != sst) { \
 			if (!(S) || !sst || strcmp((S), sst) != 0) { \
 				VIPS_FREE(S); \
@@ -71,6 +71,24 @@ extern "C" {
 #define VIPS_ARRAY(OBJ, N, T) \
 	((T *) VIPS_MALLOC(OBJ, (N) * sizeof(T)))
 
+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)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(VipsConnection, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(VipsSource, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(VipsSourceCustom, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(VipsGInputStream, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(VipsSourceGInputStream, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(VipsTarget, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(VipsTargetCustom, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(VipsSbuf, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(VipsInterpolate, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(VipsOperation, g_object_unref)
+
+// FIXME ... need more of these
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(VipsArrayDouble, VipsArrayDouble_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(VipsArrayImage, VipsArrayImage_unref)
+
 VIPS_API
 void *vips_malloc(VipsObject *object, size_t size);
 VIPS_API

package/include/vips/operation.h

@@ -69,7 +69,7 @@ typedef enum /*< flags >*/ {
 
 typedef gboolean (*VipsOperationBuildFn)(VipsObject *object);
 
-typedef struct _VipsOperation {
+struct _VipsOperation {
 	VipsObject parent_instance;
 
 	/* Keep the hash here.
@@ -80,8 +80,7 @@ typedef struct _VipsOperation {
 	/* Pixels calculated ... handy for measuring over-calculation.
 	 */
 	int pixels;
-
-} VipsOperation;
+};
 
 typedef struct _VipsOperationClass {
 	VipsObjectClass parent_class;
@@ -136,10 +135,6 @@ int vips_call_argv(VipsOperation *operation, int argc, char **argv);
 
 VIPS_API
 void vips_cache_drop_all(void);
-VIPS_DEPRECATED_FOR(vips_cache_operation_buildp)
-VipsOperation *vips_cache_operation_lookup(VipsOperation *operation);
-VIPS_DEPRECATED_FOR(vips_cache_operation_buildp)
-void vips_cache_operation_add(VipsOperation *operation);
 VIPS_API
 int vips_cache_operation_buildp(VipsOperation **operation);
 VIPS_API

package/include/vips/private.h

@@ -220,6 +220,13 @@ 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
+void VipsArrayDouble_unref(VipsArrayDouble *array);
+VIPS_API
+void VipsArrayImage_unref(VipsArrayImage *array);
+
 #ifdef __cplusplus
 }
 #endif /*__cplusplus*/

package/include/vips/util.h

@@ -61,6 +61,9 @@ extern "C" {
 
 #define VIPS_ABS(X) (((X) >= 0) ? (X) : -(X))
 
+// 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>.
  */
@@ -123,7 +126,7 @@ extern "C" {
 	{ \
 		if ((N)) { \
 			int duff_count = ((N) + 15) / 16; \
-\
+			\
 			switch ((N) % 16) { \
 			case 0: \
 				do { \
@@ -283,12 +286,6 @@ VIPS_API
 void *vips_hash_table_map(GHashTable *hash,
 	VipsSListMap2Fn fn, void *a, void *b);
 
-VIPS_API
-char *vips_strncpy(char *dest, const char *src, int n);
-VIPS_API
-char *vips_strrstr(const char *haystack, const char *needle);
-VIPS_API
-gboolean vips_ispostfix(const char *a, const char *b);
 VIPS_API
 gboolean vips_iscasepostfix(const char *a, const char *b);
 VIPS_API
@@ -296,14 +293,6 @@ gboolean vips_isprefix(const char *a, const char *b);
 VIPS_API
 char *vips_break_token(char *str, const char *brk);
 
-void vips__chomp(char *str);
-
-VIPS_API
-int vips_vsnprintf(char *str, size_t size, const char *format, va_list ap);
-VIPS_API
-int vips_snprintf(char *str, size_t size, const char *format, ...)
-	G_GNUC_PRINTF(3, 4);
-
 VIPS_API
 int vips_filename_suffix_match(const char *path, const char *suffixes[]);
 
@@ -390,6 +379,8 @@ typedef enum {
 	VIPS_TOKEN_COMMA
 } VipsToken;
 
+// 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,

package/include/vips/version.h

@@ -4,19 +4,19 @@
 #ifndef VIPS_VERSION_H
 #define VIPS_VERSION_H
 
-#define VIPS_VERSION "8.15.5"
-#define VIPS_VERSION_STRING "8.15.5"
+#define VIPS_VERSION "8.16.0"
+#define VIPS_VERSION_STRING "8.16.0"
 #define VIPS_MAJOR_VERSION (8)
-#define VIPS_MINOR_VERSION (15)
-#define VIPS_MICRO_VERSION (5)
+#define VIPS_MINOR_VERSION (16)
+#define VIPS_MICRO_VERSION (0)
 
 /* The ABI version, as used for library versioning.
  */
-#define VIPS_LIBRARY_CURRENT (59)
-#define VIPS_LIBRARY_REVISION (5)
-#define VIPS_LIBRARY_AGE (17)
+#define VIPS_LIBRARY_CURRENT (60)
+#define VIPS_LIBRARY_REVISION (0)
+#define VIPS_LIBRARY_AGE (18)
 
-#define VIPS_CONFIG "enable debug: false\nenable deprecated: false\nenable modules: false\nenable cplusplus: true\nenable RAD load/save: false\nenable Analyze7 load/save: false\nenable PPM load/save: false\nenable GIF load: true\nuse fftw for FFTs: false\nSIMD support with highway: true\naccelerate loops with ORC: false\nICC profile support with lcms: true\nzlib: 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 libspng: true\nPNG load/save with libpng: false\nselected quantisation package: imagequant\nTIFF load/save with libtiff: 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: false\nPDF load with poppler-glib: false (dynamic module: false)\nSVG load with librsvg: true\nEXR load with OpenEXR: false\nOpenSlide load: false (dynamic module: false)\nMatlab load with libmatio: false\nNIfTI load/save with niftiio: false\nFITS load/save with cfitsio: false\nGIF save with cgif: true\nselected Magick package: none (dynamic module: false)\nMagick API version: none\nMagick load: false\nMagick save: false"
+#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)"
 
 /* Not really anything to do with versions, but this is a handy place to put
  * it.

package/include/vips/vips.h

@@ -109,9 +109,6 @@ extern "C" {
 
 #include <vips/private.h>
 
-#if VIPS_ENABLE_DEPRECATED
-#include <vips/mask.h>
-#endif
 #include <vips/image.h>
 #include <vips/memory.h>
 #include <vips/error.h>
@@ -138,8 +135,15 @@ extern "C" {
 #include <vips/colour.h>
 #include <vips/draw.h>
 #include <vips/create.h>
-#if VIPS_ENABLE_DEPRECATED
-#include <vips/video.h>
+
+/* VIPS_DISABLE_COMPAT:
+ *
+ * Disable automatically inclusion of `vips7compat.h`.
+ *
+ * This has no effect when building with `-Ddeprecated=false`.
+ */
+#if VIPS_ENABLE_DEPRECATED && !defined(VIPS_DISABLE_COMPAT)
+#include <vips/vips7compat.h>
 #endif
 
 /* We can't use _ here since this will be compiled by our clients and they may
@@ -158,6 +162,8 @@ extern "C" {
 				  -1) \
 			: vips_init(ARGV0))
 
+VIPS_API
+int vips_max_coord_get(void);
 VIPS_API
 int vips_init(const char *argv0);
 VIPS_API

package/include/vips/vips8

@@ -3,7 +3,7 @@
 /*
 
     This file is part of VIPS.
-    
+
     VIPS is free software; you can redistribute it and/or modify
     it under the terms of the GNU Lesser General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
@@ -30,24 +30,25 @@
 #ifndef VIPS_CPLUSPLUS
 #define VIPS_CPLUSPLUS
 
+/* avoid conflict with Qt definitions, if they exist */
+#if defined(signals) && defined(Q_SIGNALS)
+#define _VIPS_QT_SIGNALS_DEFINED
+#undef signals
+#endif
+
 #include <vips/version.h>
 
 #include <glib-object.h>
 
-/* Define VIPS_CPLUSPLUS_EXPORTS to build a DLL using MSVC.
+/* Note: when building without Meson, it may be necessary to define
+ * _VIPS_PUBLIC as __declspec(dllexport) when building a DLL.
  */
-#ifdef _VIPS_PUBLIC
-#  define VIPS_CPLUSPLUS_API _VIPS_PUBLIC
-#elif defined(_MSC_VER)
-#  ifdef VIPS_CPLUSPLUS_EXPORTS
-#    define VIPS_CPLUSPLUS_API __declspec(dllexport)
-#  else
-#    define VIPS_CPLUSPLUS_API __declspec(dllimport)
-#  endif
-#else
-#  define VIPS_CPLUSPLUS_API
+#ifndef _VIPS_PUBLIC
+#define _VIPS_PUBLIC
 #endif
 
+#define VIPS_CPLUSPLUS_API _VIPS_PUBLIC
+
 #define VIPS_NAMESPACE_START namespace vips {
 #define VIPS_NAMESPACE_END }
 
@@ -57,4 +58,10 @@
 #include "VRegion8.h"
 #include "VConnection8.h"
 
+/* restore Qt keywords if they were disabled for GLib inclusion */
+#ifdef _VIPS_QT_SIGNALS_DEFINED
+#define signals Q_SIGNALS
+#undef _VIPS_QT_SIGNALS_DEFINED
+#endif
+
 #endif /*VIPS_CPLUSPLUS*/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@img/sharp-libvips-dev",
-  "version": "1.0.6",
+  "version": "1.1.0-rc2",
   "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,6 +1,6 @@
 {
   "aom": "3.10.0",
-  "archive": "3.7.6",
+  "archive": "3.7.7",
   "cairo": "1.18.2",
   "cgif": "0.4.1",
   "exif": "0.6.24",
@@ -9,7 +9,7 @@
   "fontconfig": "2.15.0",
   "freetype": "2.13.3",
   "fribidi": "1.0.16",
-  "glib": "2.82.1",
+  "glib": "2.82.2",
   "harfbuzz": "10.0.1",
   "heif": "1.18.2",
   "highway": "1.2.0",
@@ -23,7 +23,7 @@
   "rsvg": "2.59.1",
   "spng": "0.7.4",
   "tiff": "4.7.0",
-  "vips": "8.15.5-rc1",
+  "vips": "8.16.0-rc2",
   "webp": "1.4.0",
   "xml": "2.13.4",
   "zlib-ng": "2.2.2"