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

package/cplusplus/VImage.cpp

@@ -637,7 +637,7 @@ VImage::new_from_source(VSource source, const char *option_string,
 }
 
 VImage
-VImage::new_from_memory_steal(void *data, size_t size,
+VImage::new_from_memory_steal(const void *data, size_t size,
 	int width, int height, int bands, VipsBandFormat format)
 {
 	VipsImage *image;
@@ -647,7 +647,7 @@ VImage::new_from_memory_steal(void *data, size_t size,
 		throw(VError());
 
 	g_signal_connect(image, "postclose",
-		G_CALLBACK(vips_image_free_buffer), data);
+		G_CALLBACK(vips_image_free_buffer), const_cast<void *>(data));
 
 	return VImage(image);
 }
@@ -1592,4 +1592,20 @@ operator>>=(VImage &a, const std::vector<double> b)
 	return a;
 }
 
+// Compat operations
+
+VImage
+VImage::new_from_memory_steal(void *data, size_t size,
+	int width, int height, int bands, VipsBandFormat format)
+{
+	return new_from_memory_steal(static_cast<const void *>(data), size,
+		width, height, bands, format);
+}
+
+void
+VImage::rawsave_fd(int fd, VOption *options) const
+{
+	rawsave_target(VTarget::new_to_descriptor(fd), options);
+}
+
 VIPS_NAMESPACE_END

package/cplusplus/vips-operators.cpp

@@ -255,6 +255,18 @@ VImage::add(VImage right, VOption *options) const
 	return out;
 }
 
+VImage
+VImage::addalpha(VOption *options) const
+{
+	VImage out;
+
+	call("addalpha", (options ? options : VImage::option())
+			->set("in", *this)
+			->set("out", &out));
+
+	return out;
+}
+
 VImage
 VImage::affine(std::vector<double> matrix, VOption *options) const
 {
@@ -517,6 +529,18 @@ VImage::cast(VipsBandFormat format, VOption *options) const
 	return out;
 }
 
+VImage
+VImage::clamp(VOption *options) const
+{
+	VImage out;
+
+	call("clamp", (options ? options : VImage::option())
+			->set("in", *this)
+			->set("out", &out));
+
+	return out;
+}
+
 VImage
 VImage::colourspace(VipsInterpretation space, VOption *options) const
 {
@@ -2327,6 +2351,19 @@ VImage::max(VOption *options) const
 	return out;
 }
 
+VImage
+VImage::maxpair(VImage right, VOption *options) const
+{
+	VImage out;
+
+	call("maxpair", (options ? options : VImage::option())
+			->set("left", *this)
+			->set("out", &out)
+			->set("right", right));
+
+	return out;
+}
+
 VImage
 VImage::measure(int h, int v, VOption *options) const
 {
@@ -2369,6 +2406,19 @@ VImage::min(VOption *options) const
 	return out;
 }
 
+VImage
+VImage::minpair(VImage right, VOption *options) const
+{
+	VImage out;
+
+	call("minpair", (options ? options : VImage::option())
+			->set("left", *this)
+			->set("out", &out)
+			->set("right", right));
+
+	return out;
+}
+
 VImage
 VImage::morph(VImage mask, VipsOperationMorphology morph, VOption *options) const
 {
@@ -2884,12 +2934,24 @@ VImage::rawsave(const char *filename, VOption *options) const
 			->set("filename", filename));
 }
 
+VipsBlob *
+VImage::rawsave_buffer(VOption *options) const
+{
+	VipsBlob *buffer;
+
+	call("rawsave_buffer", (options ? options : VImage::option())
+			->set("in", *this)
+			->set("buffer", &buffer));
+
+	return buffer;
+}
+
 void
-VImage::rawsave_fd(int fd, VOption *options) const
+VImage::rawsave_target(VTarget target, VOption *options) const
 {
-	call("rawsave_fd", (options ? options : VImage::option())
+	call("rawsave_target", (options ? options : VImage::option())
 			->set("in", *this)
-			->set("fd", fd));
+			->set("target", target));
 }
 
 VImage
@@ -3161,6 +3223,20 @@ VImage::scharr(VOption *options) const
 	return out;
 }
 
+VImage
+VImage::sdf(int width, int height, VipsSdfShape shape, VOption *options)
+{
+	VImage out;
+
+	call("sdf", (options ? options : VImage::option())
+			->set("out", &out)
+			->set("width", width)
+			->set("height", height)
+			->set("shape", shape));
+
+	return out;
+}
+
 VImage
 VImage::sequential(VOption *options) const
 {

package/include/archive.h

@@ -34,7 +34,7 @@
  * assert that ARCHIVE_VERSION_NUMBER >= 2012108.
  */
 /* Note: Compiler will complain if this does not match archive_entry.h! */
-#define	ARCHIVE_VERSION_NUMBER 3007006
+#define	ARCHIVE_VERSION_NUMBER 3007007
 
 #include <sys/stat.h>
 #include <stddef.h>  /* for wchar_t */
@@ -155,7 +155,7 @@ __LA_DECL int		archive_version_number(void);
 /*
  * Textual name/version of the library, useful for version displays.
  */
-#define	ARCHIVE_VERSION_ONLY_STRING "3.7.6"
+#define	ARCHIVE_VERSION_ONLY_STRING "3.7.7"
 #define	ARCHIVE_VERSION_STRING "libarchive " ARCHIVE_VERSION_ONLY_STRING
 __LA_DECL const char *	archive_version_string(void);
 

package/include/archive_entry.h

@@ -28,7 +28,7 @@
 #define	ARCHIVE_ENTRY_H_INCLUDED
 
 /* Note: Compiler will complain if this does not match archive.h! */
-#define	ARCHIVE_VERSION_NUMBER 3007006
+#define	ARCHIVE_VERSION_NUMBER 3007007
 
 /*
  * Note: archive_entry.h is for use outside of libarchive; the