Skip to content

Commit aaa7658

Browse files
committed
use the existing memory object as the API defines.
1 parent d40f11b commit aaa7658

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

bindings/java/src/main/java/com/cadoodlecad/manifold/ManifoldBindings.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -578,25 +578,25 @@ public MemorySegment importMeshGL64(double[] vertices, long[] triangles, long nV
578578
meshGL = (MemorySegment) mh.invoke(meshGLmem, vertPtr, nVerts, 3L, triPtr, nTris);
579579

580580
MemorySegment mergedMem = (MemorySegment) functions.get("manifold_alloc_meshgl64").invoke();
581-
MemorySegment merged = null;
582581

583582
try {
584-
merged = (MemorySegment) functions.get("manifold_meshgl64_merge").invoke(mergedMem, meshGL);
583+
functions.get("manifold_meshgl64_merge").invoke(mergedMem, meshGL);
585584

586585
MemorySegment manMem = (MemorySegment) functions.get("manifold_alloc_manifold").invoke();
587-
MemorySegment result = (MemorySegment) functions.get("manifold_of_meshgl64").invoke(manMem, merged);
586+
MemorySegment result = (MemorySegment) functions.get("manifold_of_meshgl64").invoke(manMem, mergedMem);
588587

589588
try {
590-
functions.get("manifold_delete_meshgl64").invoke(meshGL);
589+
functions.get("manifold_delete_meshgl64").invoke(mergedMem);
590+
mergedMem=null;
591591
} catch (Throwable ignored) {
592592
}
593593

594594
return result;
595595

596596
} catch (Throwable e) {
597-
if (merged != null)
597+
if (mergedMem != null)
598598
try {
599-
functions.get("manifold_delete_meshgl64").invoke(merged);
599+
functions.get("manifold_delete_meshgl64").invoke(mergedMem);
600600
} catch (Throwable ignored) {
601601
}
602602
throw e;

0 commit comments

Comments
 (0)