Add support for vips_image_new_from_memory (#159)

Author: lopcode

README.md

@@ -22,7 +22,7 @@ repositories {
 }
 
 dependencies {
-    implementation("app.photofox.vips-ffm:vips-ffm-core:1.7.0")
+    implementation("app.photofox.vips-ffm:vips-ffm-core:1.7.1")
 }
 ```
 

core/src/main/java/app/photofox/vipsffm/VImage.java

@@ -52,6 +52,7 @@
 import java.lang.String;
 import java.lang.foreign.Arena;
 import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -9700,6 +9701,19 @@ public static VImage newFromBytes(Arena arena, byte[] bytes, VipsOption... optio
     return newFromSource(arena, source, options);
   }
 
+  /// Creates a new VImage from raw bytes, mapping directly to the `vips_image_new_from_memory` function, with some checks.
+  ///
+  /// This is included for narrow use cases where you have image bytes representing partially supported image formats from another library (like DICOM), and you need a way to get them in to libvips without using the built-in source loaders.
+  /// Note that due to Java FFM limitations, a full copy to native memory must still be performed. 
+  ///
+  /// This is an advanced method - if possible, use [VImage#newFromFile] and friends instead. If you have bytes to load, you could use [VImage#newFromBytes].
+  public static VImage newFromMemory(Arena arena, byte[] bytes, int width, int height, int bands,
+      int format) throws VipsError {
+    var offHeapBytes = arena.allocateFrom(ValueLayout.JAVA_BYTE, bytes);
+    var imagePointer = VipsHelper.image_new_from_memory(arena, offHeapBytes, offHeapBytes.byteSize(), width, height, bands, format);
+    return new VImage(arena, imagePointer);
+  }
+
   /// Creates a new VImage from an [InputStream]. This uses libvips' "custom streaming" feature and is
   /// therefore quite efficient, avoiding the need to make extra full copies of the image's data.
   /// You could, for example, use this function to create an image directly from an API call, thumbnail it,

core/src/main/java/app/photofox/vipsffm/VipsHelper.java

@@ -1021,6 +1021,40 @@ public static MemorySegment image_new(Arena arena) throws VipsError {
     return result;
   }
 
+  /// Binding for:
+  /// ```c
+  /// VipsImage *vips_image_new_from_memory(const void *data, size_t size, int width, int height, int bands, VipsBandFormat format)
+  /// ```
+  public static MemorySegment image_new_from_memory(Arena arena, MemorySegment data, long size,
+      int width, int height, int bands, int format) throws VipsError {
+    if(!VipsValidation.isValidPointer(data)) {
+      VipsValidation.throwInvalidInputError("vips_image_new_from_memory", "data");
+    }
+    var result = VipsRaw.vips_image_new_from_memory(data, size, width, height, bands, format);
+    if(!VipsValidation.isValidPointer(result)) {
+      VipsValidation.throwInvalidOutputError("vips_image_new_from_memory", "result");
+    }
+    result = result.reinterpret(arena, VipsRaw::g_object_unref);
+    return result;
+  }
+
+  /// Binding for:
+  /// ```c
+  /// VipsImage *vips_image_new_from_memory_copy(const void *data, size_t size, int width, int height, int bands, VipsBandFormat format)
+  /// ```
+  public static MemorySegment image_new_from_memory_copy(Arena arena, MemorySegment data, long size,
+      int width, int height, int bands, int format) throws VipsError {
+    if(!VipsValidation.isValidPointer(data)) {
+      VipsValidation.throwInvalidInputError("vips_image_new_from_memory_copy", "data");
+    }
+    var result = VipsRaw.vips_image_new_from_memory_copy(data, size, width, height, bands, format);
+    if(!VipsValidation.isValidPointer(result)) {
+      VipsValidation.throwInvalidOutputError("vips_image_new_from_memory_copy", "result");
+    }
+    result = result.reinterpret(arena, VipsRaw::g_object_unref);
+    return result;
+  }
+
   /// Binding for:
   /// ```c
   /// void vips_image_set_delete_on_close(VipsImage *image, gboolean delete_on_close)

core/src/main/java/app/photofox/vipsffm/jextract/VipsRaw.java

@@ -6995,6 +6995,132 @@ public static MemorySegment vips_image_new() {
         }
     }
 
+    private static class vips_image_new_from_memory {
+        public static final FunctionDescriptor DESC = FunctionDescriptor.of(
+            VipsRaw.C_POINTER,
+            VipsRaw.C_POINTER,
+            VipsRaw.C_LONG,
+            VipsRaw.C_INT,
+            VipsRaw.C_INT,
+            VipsRaw.C_INT,
+            VipsRaw.C_INT
+        );
+
+        public static final MemorySegment ADDR = VipsRaw.findOrThrow("vips_image_new_from_memory");
+
+        public static final MethodHandle HANDLE = Linker.nativeLinker().downcallHandle(ADDR, DESC);
+    }
+
+    /**
+     * Function descriptor for:
+     * {@snippet lang=c :
+     * extern VipsImage *vips_image_new_from_memory(const void *data, size_t size, int width, int height, int bands, VipsBandFormat format)
+     * }
+     */
+    public static FunctionDescriptor vips_image_new_from_memory$descriptor() {
+        return vips_image_new_from_memory.DESC;
+    }
+
+    /**
+     * Downcall method handle for:
+     * {@snippet lang=c :
+     * extern VipsImage *vips_image_new_from_memory(const void *data, size_t size, int width, int height, int bands, VipsBandFormat format)
+     * }
+     */
+    public static MethodHandle vips_image_new_from_memory$handle() {
+        return vips_image_new_from_memory.HANDLE;
+    }
+
+    /**
+     * Address for:
+     * {@snippet lang=c :
+     * extern VipsImage *vips_image_new_from_memory(const void *data, size_t size, int width, int height, int bands, VipsBandFormat format)
+     * }
+     */
+    public static MemorySegment vips_image_new_from_memory$address() {
+        return vips_image_new_from_memory.ADDR;
+    }
+
+    /**
+     * {@snippet lang=c :
+     * extern VipsImage *vips_image_new_from_memory(const void *data, size_t size, int width, int height, int bands, VipsBandFormat format)
+     * }
+     */
+    public static MemorySegment vips_image_new_from_memory(MemorySegment data, long size, int width, int height, int bands, int format) {
+        var mh$ = vips_image_new_from_memory.HANDLE;
+        try {
+            if (TRACE_DOWNCALLS) {
+                traceDowncall("vips_image_new_from_memory", data, size, width, height, bands, format);
+            }
+            return (MemorySegment)mh$.invokeExact(data, size, width, height, bands, format);
+        } catch (Throwable ex$) {
+           throw new AssertionError("should not reach here", ex$);
+        }
+    }
+
+    private static class vips_image_new_from_memory_copy {
+        public static final FunctionDescriptor DESC = FunctionDescriptor.of(
+            VipsRaw.C_POINTER,
+            VipsRaw.C_POINTER,
+            VipsRaw.C_LONG,
+            VipsRaw.C_INT,
+            VipsRaw.C_INT,
+            VipsRaw.C_INT,
+            VipsRaw.C_INT
+        );
+
+        public static final MemorySegment ADDR = VipsRaw.findOrThrow("vips_image_new_from_memory_copy");
+
+        public static final MethodHandle HANDLE = Linker.nativeLinker().downcallHandle(ADDR, DESC);
+    }
+
+    /**
+     * Function descriptor for:
+     * {@snippet lang=c :
+     * extern VipsImage *vips_image_new_from_memory_copy(const void *data, size_t size, int width, int height, int bands, VipsBandFormat format)
+     * }
+     */
+    public static FunctionDescriptor vips_image_new_from_memory_copy$descriptor() {
+        return vips_image_new_from_memory_copy.DESC;
+    }
+
+    /**
+     * Downcall method handle for:
+     * {@snippet lang=c :
+     * extern VipsImage *vips_image_new_from_memory_copy(const void *data, size_t size, int width, int height, int bands, VipsBandFormat format)
+     * }
+     */
+    public static MethodHandle vips_image_new_from_memory_copy$handle() {
+        return vips_image_new_from_memory_copy.HANDLE;
+    }
+
+    /**
+     * Address for:
+     * {@snippet lang=c :
+     * extern VipsImage *vips_image_new_from_memory_copy(const void *data, size_t size, int width, int height, int bands, VipsBandFormat format)
+     * }
+     */
+    public static MemorySegment vips_image_new_from_memory_copy$address() {
+        return vips_image_new_from_memory_copy.ADDR;
+    }
+
+    /**
+     * {@snippet lang=c :
+     * extern VipsImage *vips_image_new_from_memory_copy(const void *data, size_t size, int width, int height, int bands, VipsBandFormat format)
+     * }
+     */
+    public static MemorySegment vips_image_new_from_memory_copy(MemorySegment data, long size, int width, int height, int bands, int format) {
+        var mh$ = vips_image_new_from_memory_copy.HANDLE;
+        try {
+            if (TRACE_DOWNCALLS) {
+                traceDowncall("vips_image_new_from_memory_copy", data, size, width, height, bands, format);
+            }
+            return (MemorySegment)mh$.invokeExact(data, size, width, height, bands, format);
+        } catch (Throwable ex$) {
+           throw new AssertionError("should not reach here", ex$);
+        }
+    }
+
     private static class vips_image_set_delete_on_close {
         public static final FunctionDescriptor DESC = FunctionDescriptor.ofVoid(
             VipsRaw.C_POINTER,