@img/sharp-libvips-dev 0.0.1 → 0.0.2

package/include/vips/vector.h

@@ -1,180 +1,60 @@
-/* helper stuff for Orc
+/* helper stuff for Highway
  *
- * 29/10/10
- *	- from im_dilate hackery
+ * 16/03/21 kleisauke
+ *	- from vector.h
  */
 
 /*
 
-    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
-    (at your option) any later version.
+	This file is part of VIPS.
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
+	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
+	(at your option) any later version.
 
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301  USA
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+	02110-1301  USA
 
  */
 
 /*
 
-    These files are distributed with VIPS - http://www.vips.ecs.soton.ac.uk
+	These files are distributed with VIPS - http://www.vips.ecs.soton.ac.uk
 
  */
 
 #ifndef VIPS_VECTOR_H
 #define VIPS_VECTOR_H
 
-/* If we are building with -fcf-protection (run-time checking of
- * indirect jumps) then Orc won't work. Make sure it's off.
- *
- * https://gcc.gnu.org/onlinedocs/gcc/\
- * 	Instrumentation-Options.html#index-fcf-protection
- * https://gitlab.freedesktop.org/gstreamer/orc/issues/17
- *
- * orc 0.4.30 and later work with cf-protection.
- */
-#ifdef __CET__
-#ifndef HAVE_ORC_CF_PROTECTION
-#undef HAVE_ORC
-#endif
-#endif
-
-#ifdef HAVE_ORC
-#include <orc/orc.h>
-#endif /*HAVE_ORC*/
-
 #ifdef __cplusplus
 extern "C" {
 #endif /*__cplusplus*/
 
-#define VIPS_VECTOR_SOURCE_MAX (10)
-
-/* An Orc program. 
- */
-typedef struct {
-	/* Handy for debugging.
-	 */
-	const char *name;
-	char *unique_name;
-
-	/* How many resources we've used so far in this codegen. 
-	 */
-	int n_temp;
-	int n_scanline;
-	int n_source;
-	int n_destination;
-	int n_constant;
-	int n_parameter;
-	int n_instruction;
-
-	/* The scanline sources, and for each variable, the associated line.
-	 * "sl0" onwards.
-	 */
-	int sl[VIPS_VECTOR_SOURCE_MAX];
-	int line[VIPS_VECTOR_SOURCE_MAX]; 		
-
-	/* Non-scanline sources, "s1" etc. s[0] is the var for "s1".
-	 */
-	int s[VIPS_VECTOR_SOURCE_MAX];
-
-	/* The destination var.
-	 */
-	int d1;
-
-#ifdef HAVE_ORC
-        /* The code we have generated.
-	 */
-        OrcProgram *program;
-#endif /*HAVE_ORC*/
-
-	/* Compiled successfully.
-	 */
-	gboolean compiled;
-} VipsVector;
-
-/* An executor.
- */
-typedef struct {
-#ifdef HAVE_ORC
-	OrcExecutor executor;
-#endif /*HAVE_ORC*/
-
-	VipsVector *vector;
-} VipsExecutor;
-
 /* Set from the command-line.
  */
 extern gboolean vips__vector_enabled;
 
 VIPS_API
-void vips_vector_init( void );
-VIPS_API
-gboolean vips_vector_isenabled( void );
-VIPS_API
-void vips_vector_set_enabled( gboolean enabled );
-
-VIPS_API
-void vips_vector_free( VipsVector *vector );
-VIPS_API
-VipsVector *vips_vector_new( const char *name, int dsize );
-
-VIPS_API
-void vips_vector_constant( VipsVector *vector, 
-	char *name, int value, int size );
-VIPS_API
-void vips_vector_source_scanline( VipsVector *vector, 
-	char *name, int line, int size );
-VIPS_API
-int vips_vector_source_name( VipsVector *vector, const char *name, int size );
-VIPS_API
-void vips_vector_temporary( VipsVector *vector, const char *name, int size );
-VIPS_API
-int vips_vector_parameter( VipsVector *vector, const char *name, int size );
+gboolean vips_vector_isenabled(void);
 VIPS_API
-int vips_vector_destination( VipsVector *vector, const char *name, int size );
-VIPS_API
-void vips_vector_asm2( VipsVector *vector, 
-	const char *op, const char *a, const char *b );
-VIPS_API
-void vips_vector_asm3( VipsVector *vector, 
-	const char *op, const char *a, const char *b, const char *c );
-VIPS_API
-gboolean vips_vector_full( VipsVector *vector );
+void vips_vector_set_enabled(gboolean enabled);
 
 VIPS_API
-gboolean vips_vector_compile( VipsVector *vector );
-
+gint64 vips_vector_get_builtin_targets(void);
 VIPS_API
-void vips_vector_print( VipsVector *vector );
-
-VIPS_API
-void vips_executor_set_program( VipsExecutor *executor, 
-	VipsVector *vector, int n );
-VIPS_API
-void vips_executor_set_scanline( VipsExecutor *executor, 
-	VipsRegion *ir, int x, int y );
-VIPS_API
-void vips_executor_set_destination( VipsExecutor *executor, void *value );
+gint64 vips_vector_get_supported_targets(void);
 VIPS_API
-void vips_executor_set_parameter( VipsExecutor *executor, int var, int value );
-VIPS_API
-void vips_executor_set_array( VipsExecutor *executor, int var, void *value );
-
-VIPS_API
-void vips_executor_run( VipsExecutor *executor ); 
-
+const char *vips_vector_target_name(gint64 target);
 VIPS_API
-void vips_vector_to_fixed_point( double *in, int *out, int n, int scale );
+void vips_vector_disable_targets(gint64 disabled_targets);
 
 #ifdef __cplusplus
 }

package/include/vips/version.h

@@ -4,19 +4,19 @@
 #ifndef VIPS_VERSION_H
 #define VIPS_VERSION_H
 
-#define VIPS_VERSION		"8.14.5"
-#define VIPS_VERSION_STRING	"8.14.5"
-#define VIPS_MAJOR_VERSION	(8)
-#define VIPS_MINOR_VERSION	(14)
-#define VIPS_MICRO_VERSION	(5)
+#define VIPS_VERSION "8.15.0"
+#define VIPS_VERSION_STRING "8.15.0"
+#define VIPS_MAJOR_VERSION (8)
+#define VIPS_MINOR_VERSION (15)
+#define VIPS_MICRO_VERSION (0)
 
 /* The ABI version, as used for library versioning.
  */
-#define VIPS_LIBRARY_CURRENT	(58)
-#define VIPS_LIBRARY_REVISION	(5)
-#define VIPS_LIBRARY_AGE	(16)
+#define VIPS_LIBRARY_CURRENT (59)
+#define VIPS_LIBRARY_REVISION (0)
+#define VIPS_LIBRARY_AGE (17)
 
-#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\naccelerate loops with ORC: true\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/save: false\nenable PPM load/save: false\nenable GIF load: true\nuse fftw for FFTs: false\nSIMD support with highway: false\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"
 
 /* Not really anything to do with versions, but this is a handy place to put
  * it.

package/include/vips/vips.h

@@ -52,28 +52,28 @@
 
 /*
 
-    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
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301  USA
+	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
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+	02110-1301  USA
 
  */
 
 /*
 
-    These files are distributed with VIPS - http://www.vips.ecs.soton.ac.uk
+	These files are distributed with VIPS - http://www.vips.ecs.soton.ac.uk
 
  */
 
@@ -145,47 +145,48 @@ extern "C" {
 /* We can't use _ here since this will be compiled by our clients and they may
  * not have _().
  */
-#define VIPS_INIT( ARGV0 ) \
-	(vips_version( 3 ) - vips_version( 5 ) != \
-	 	VIPS_LIBRARY_CURRENT - VIPS_LIBRARY_AGE ? ( \
-		g_warning( "ABI mismatch" ), \
-		g_warning( "library has ABI version %d", \
-			vips_version( 3 ) - vips_version( 5 ) ), \
-		g_warning( "application needs ABI version %d", \
-			VIPS_LIBRARY_CURRENT - VIPS_LIBRARY_AGE ), \
-		vips_error( "vips_init", "ABI mismatch" ), \
-		-1 ) : \
-		vips_init( ARGV0 ))
+#define VIPS_INIT(ARGV0) \
+	(vips_version(3) - vips_version(5) != \
+				VIPS_LIBRARY_CURRENT - VIPS_LIBRARY_AGE \
+			? ( \
+				  g_warning("ABI mismatch"), \
+				  g_warning("library has ABI version %d", \
+					  vips_version(3) - vips_version(5)), \
+				  g_warning("application needs ABI version %d", \
+					  VIPS_LIBRARY_CURRENT - VIPS_LIBRARY_AGE), \
+				  vips_error("vips_init", "ABI mismatch"), \
+				  -1) \
+			: vips_init(ARGV0))
 
 VIPS_API
-int vips_init( const char *argv0 );
+int vips_init(const char *argv0);
 VIPS_API
-const char *vips_get_argv0( void );
+const char *vips_get_argv0(void);
 VIPS_API
-const char *vips_get_prgname( void );
+const char *vips_get_prgname(void);
 VIPS_API
-void vips_shutdown( void );
+void vips_shutdown(void);
 VIPS_API
-void vips_thread_shutdown( void );
+void vips_thread_shutdown(void);
 
 VIPS_API
-void vips_add_option_entries( GOptionGroup *option_group );
+void vips_add_option_entries(GOptionGroup *option_group);
 
 VIPS_API
-void vips_leak_set( gboolean leak ); 
+void vips_leak_set(gboolean leak);
 
 VIPS_API
-void vips_block_untrusted_set( gboolean state );
+void vips_block_untrusted_set(gboolean state);
 
 VIPS_API
-const char *vips_version_string( void );
+const char *vips_version_string(void);
 VIPS_API
-int vips_version( int flag );
+int vips_version(int flag);
 
 VIPS_API
-const char *vips_guess_prefix( const char *argv0, const char *env_name );
+const char *vips_guess_prefix(const char *argv0, const char *env_name);
 VIPS_API
-const char *vips_guess_libdir( const char *argv0, const char *env_name );
+const char *vips_guess_libdir(const char *argv0, const char *env_name);
 
 #ifdef __cplusplus
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@img/sharp-libvips-dev",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "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,7 +1,7 @@
 {
-  "aom": "3.6.1",
+  "aom": "3.7.0",
   "archive": "3.7.2",
-  "cairo": "1.17.8",
+  "cairo": "1.18.0",
   "cgif": "0.3.2",
   "exif": "0.6.24",
   "expat": "2.5.0",
@@ -11,12 +11,12 @@
   "fribidi": "1.0.13",
   "gdkpixbuf": "2.42.10",
   "glib": "2.78.0",
-  "harfbuzz": "8.2.0",
-  "heif": "1.16.2",
+  "harfbuzz": "8.2.2",
+  "heif": "1.17.1",
+  "highway": "1.0.7",
   "imagequant": "2.4.1",
   "lcms": "2.15",
-  "mozjpeg": "4.1.4",
-  "orc": "0.4.34",
+  "mozjpeg": "4.1.5",
   "pango": "1.51.0",
   "pixman": "0.42.2",
   "png": "1.6.40",
@@ -24,7 +24,7 @@
   "rsvg": "2.57.0",
   "spng": "0.7.4",
   "tiff": "4.6.0",
-  "vips": "8.14.5",
+  "vips": "8.15.0-rc1",
   "webp": "1.3.2",
   "xml": "2.11.5",
   "zlib-ng": "2.1.3"